[usb]: fixup ethernet gadget, disable EEM support

[openwrt.git] / package / kernel / linux / modules / usb.mk

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index a9218f4f33cd9d3d2f858be22fc0cf250bd10687..ab7c5dd828f901690f4edc037cd6894c2467a356 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -211,16 +211,17 @@ define KernelPackage/usb-eth-gadget
   KCONFIG:= \
        CONFIG_USB_ETH \
        CONFIG_USB_ETH_RNDIS=y \
-       CONFIG_USB_ETH_EEM=y
+       CONFIG_USB_ETH_EEM=n
   DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
 ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),)
   FILES:= \
        $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \
        $(LINUX_DIR)/drivers/usb/gadget/u_rndis.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/usb_f_eem.ko \
        $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
-  AUTOLOAD:=$(call AutoLoad,52,g_ether)
+  AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
 else
   FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
   AUTOLOAD:=$(call AutoLoad,52,g_ether)