kernel: Fix USB gadget modules for v3.18

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

Signed-off-by: Owen Kirby <[email protected]>
SVN-Revision: 44502

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6faa437bcae55c2ffed8e5f6565af7a205ed5e00..acb92133f0e2b926a94168a86d1b7c81e1e4dc14 100644 (file)
--- 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/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/legacy/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected]
   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/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/legacy/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected] \
+       $(LINUX_DIR)/drivers/usb/gadget/[email protected]
   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 e8ae3426135b1fe79e5d2ff6dc68d55057578955..7ad0efcb0a2e2103b2315f188179dcb8f40730ae 100644 (file)
--- 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