From: kaloz Date: Mon, 10 Feb 2014 14:38:22 +0000 (+0000) Subject: [usb]: fixup ethernet gadget, disable EEM support X-Git-Tag: fast2504n-3.10.28-merged~97 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b25189d58d246bf15942cf6712f82373c6bb8fd7;p=openwrt.git [usb]: fixup ethernet gadget, disable EEM support Signed-off-by: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39558 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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)