X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9da7868465f5ba68cd6efd12172c61bf0f1c2001..f8c4b35cc4bb2e3ddba5aef51fc3327fe6bc3435:/package/kernel/modules/usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index fd027bca6..e0b5251a1 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -16,8 +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
-  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko
-  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:= \
+	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
+	$(LINUX_DIR)/drivers/usb/usb-common.ko
+    AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1)
+  else
+    FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko
+    AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
+  endif
   $(call AddDepends/nls)
 endef
 
@@ -93,6 +100,7 @@ define KernelPackage/usb-ohci
 	CONFIG_USB_OHCI \
 	CONFIG_USB_OHCI_HCD \
 	CONFIG_USB_OHCI_AR71XX=y \
+	CONFIG_USB_OHCI_ATH79=y \
 	CONFIG_USB_OCTEON_OHCI=y
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
@@ -203,6 +211,7 @@ define KernelPackage/usb2
   DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx
   KCONFIG:=CONFIG_USB_EHCI_HCD \
     CONFIG_USB_EHCI_AR71XX=y \
+    CONFIG_USB_EHCI_ATH79=y \
     CONFIG_USB_OCTEON_EHCI=y \
     CONFIG_USB_EHCI_FSL=n
   FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko