aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
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
commit0a6385e94274b869fe848e17df88d188730fae05 (patch)
tree08d5f433394e8c907889335be71a0b921d63b880 /package/kernel/linux
parent116d7fc9c274602dceee96d658010d9eeca6ce3e (diff)
downloadupstream-0a6385e94274b869fe848e17df88d188730fae05.tar.gz
upstream-0a6385e94274b869fe848e17df88d188730fae05.tar.bz2
upstream-0a6385e94274b869fe848e17df88d188730fae05.zip
fixup ethernet gadget, disable EEM support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39558
Diffstat (limited to 'package/kernel/linux')
-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)