aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-10 14:38:22 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-10 14:38:22 +0000
commitc67ae15f11d4e037b2edb33fd70839713fe4aa77 (patch)
tree4de4ae6d16a872b955d7518bcde70d092b8e6a14 /package
parent6d0e1cc740c22361096bf2bd31dd8ffe6205df13 (diff)
downloadupstream-c67ae15f11d4e037b2edb33fd70839713fe4aa77.tar.gz
upstream-c67ae15f11d4e037b2edb33fd70839713fe4aa77.tar.bz2
upstream-c67ae15f11d4e037b2edb33fd70839713fe4aa77.zip
[usb]: fixup ethernet gadget, disable EEM support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39558 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/kernel/linux/modules/usb.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index a9218f4f33..ab7c5dd828 100644
--- 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)