diff options
| author | John Crispin <blogic@openwrt.org> | 2014-11-17 14:30:19 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-11-17 14:30:19 +0000 |
| commit | 822237afe464007260f561d3ca0c589fd29b9724 (patch) | |
| tree | 0a5f04007f4a8ffc5c327dc5c119e633895179a0 | |
| parent | 1704e80f584f32795123e516c11bad0c43d2965f (diff) | |
| download | upstream-822237afe464007260f561d3ca0c589fd29b9724.tar.gz upstream-822237afe464007260f561d3ca0c589fd29b9724.tar.bz2 upstream-822237afe464007260f561d3ca0c589fd29b9724.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43290 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 6 |
1 files changed, 6 insertions, 0 deletions
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 |