summaryrefslogtreecommitdiff
path: root/package/kernel/linux/modules/usb.mk
diff options
context:
space:
mode:
authorluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-12-09 11:30:18 +0000
committerluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-12-09 11:30:18 +0000
commitde7c8b36b0124fd13d6b878916f261e21e9eeb06 (patch)
tree2ac1c6e3bd6de8bae8dc651e18461882fbb83d50 /package/kernel/linux/modules/usb.mk
parentcad63b7342795aaf6aa071b687aeeeae5803e539 (diff)
kernel: module updates for 3.12
Signed-off-by: Tim Harvey <tharvey@gateworks.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/linux/modules/usb.mk')
-rw-r--r--package/kernel/linux/modules/usb.mk14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index e1611aaa28..bd69faa776 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -737,7 +737,13 @@ define KernelPackage/usb-net
TITLE:=Kernel modules for USB-to-Ethernet convertors
KCONFIG:=CONFIG_USB_USBNET CONFIG_MII=y
AUTOLOAD:=$(call AutoProbe,usbnet)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko
+else
+ FILES:=\
+ $(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko \
+ $(LINUX_DIR)/drivers/net/mii.ko
+endif
$(call AddDepends/usb)
endef
@@ -1063,11 +1069,19 @@ define KernelPackage/usb-chipidea
CONFIG_USB_CHIPIDEA_HOST=y \
CONFIG_USB_CHIPIDEA_UDC=n \
CONFIG_USB_CHIPIDEA_DEBUG=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1)
FILES:=\
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \
$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko)
AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1)
+else
+ FILES:=\
+ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
+ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \
+ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko)
+ AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1)
+endif
$(call AddDepends/usb)
endef