From: John Crispin <john@openwrt.org>
Date: Sun, 22 Feb 2015 08:29:01 +0000 (+0000)
Subject: kernel: Fix USB gadget modules for v3.18
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=3f97de8350e817196c28c99770e17e3e70f0436f

kernel: Fix USB gadget modules for v3.18

Updated patch that fixes whitespace and supports kernel v3.3 too.

Signed-off-by: Owen Kirby <osk@exegin.com>

SVN-Revision: 44502
---

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6faa437bca..acb92133f0 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -254,16 +254,19 @@ define KernelPackage/usb-eth-gadget
 	CONFIG_USB_ETH_RNDIS=y \
 	CONFIG_USB_ETH_EEM=n
   DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),)
+ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
-  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),)
-    FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko
-  endif
+	$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko@lt3.14 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18
   AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
 else
   FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
@@ -283,13 +286,18 @@ define KernelPackage/usb-serial-gadget
   TITLE:=USB Serial Gadget support
   KCONFIG:=CONFIG_USB_G_SERIAL
   DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),)
+ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),)
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \
-	$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
+	$(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko@ge3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko@lt3.18
   AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
 else
   FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index e8ae342613..7ad0efcb0a 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -4055,6 +4055,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_GL860 is not set
 # CONFIG_USB_GOKU is not set
 # CONFIG_USB_GPIO_VBUS is not set