[OpenWrt-Devel] [PATCH 1/2] kernel/modules: location of usb-common.ko changed

Daniel Golle daniel at makrotopia.org
Mon Nov 17 09:10:07 EST 2014


usb-common.ko was moved to drivers/usb/common starting from kernel 3.16
by upstream commit f4cbd33fd5f0587910fa9db403a1b42f1cabf820

Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/kernel/linux/modules/usb.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index cc7092e..74de446 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -16,9 +16,15 @@ define KernelPackage/usb-core
   TITLE:=Support for USB
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
+	$(LINUX_DIR)/drivers/usb/common/usb-common.ko
+else
   FILES:= \
 	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
 	$(LINUX_DIR)/drivers/usb/usb-common.ko
+endif
   AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1)
   $(call AddDepends/nls)
 endef
-- 
2.1.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list