From: John Crispin <john@openwrt.org>
Date: Mon, 17 Nov 2014 14:30:19 +0000 (+0000)
Subject: kernel/modules: location of usb-common.ko changed
X-Git-Tag: reboot~5330
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45462e9c993948928d64d3acfee94bfe48fb1600;p=oweals%2Fopenwrt.git

kernel/modules: location of usb-common.ko changed

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

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43290
---

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index cc7092ec5a..74de4461fb 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