aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux/modules
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-04-04 10:16:52 +0000
committerJonas Gorski <jogo@openwrt.org>2014-04-04 10:16:52 +0000
commit86fa1440c748ab7f20ecaa094da7f5bc83510fde (patch)
tree729257c1c0f63c8edd7ca23ed4be4cd7a35ca4a6 /package/kernel/linux/modules
parent52388da14ae3c8c0e536faba2322e1862e6e97fb (diff)
downloadupstream-86fa1440c748ab7f20ecaa094da7f5bc83510fde.tar.gz
upstream-86fa1440c748ab7f20ecaa094da7f5bc83510fde.tar.bz2
upstream-86fa1440c748ab7f20ecaa094da7f5bc83510fde.zip
kernel: fix usb module paths for 3.14
dwc2 was promoted from staging, while u_rndis was merged into usb_f_rndis. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 40378
Diffstat (limited to 'package/kernel/linux/modules')
-rw-r--r--package/kernel/linux/modules/usb.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6537f09294..86247796c1 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -253,11 +253,13 @@ define KernelPackage/usb-eth-gadget
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/g_ether.ko
+ ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),)
+ FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko
+ endif
AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
@@ -405,9 +407,15 @@ define KernelPackage/usb-dwc2
CONFIG_USB_DWC2_DEBUG=n \
CONFIG_USB_DWC2_VERBOSE=n \
CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1)
+ FILES:= \
+ $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \
+ $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko
+else
FILES:= \
$(LINUX_DIR)/drivers/staging/dwc2/dwc2.ko \
$(LINUX_DIR)/drivers/staging/dwc2/dwc2_platform.ko
+endif
AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform,1)
$(call AddDepends/usb)
endef