aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-01-27 21:28:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-01-27 21:28:26 +0000
commit3fba86cec6cf3bcb944f7e0dea7a997d56c14722 (patch)
treece2eedb6134851c21b58e5ce1dc89d57d2286b0c
parent76de1e8509d9fd8f9077b3c3b35c9498faaa4d5b (diff)
downloadupstream-3fba86cec6cf3bcb944f7e0dea7a997d56c14722.tar.gz
upstream-3fba86cec6cf3bcb944f7e0dea7a997d56c14722.tar.bz2
upstream-3fba86cec6cf3bcb944f7e0dea7a997d56c14722.zip
kernel: make usb2-pci depend on usb2 and not the other way around
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35339 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/usb.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index e578d12cfa..0a995d0c3f 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -112,7 +112,7 @@ $(eval $(call KernelPackage,usb-ohci,1))
define KernelPackage/usb2
TITLE:=Support for USB2 controllers
- DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx +(PCI_SUPPORT&&LINUX_3_8):usb2-pci
+ DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx
KCONFIG:=CONFIG_USB_EHCI_HCD \
CONFIG_USB_EHCI_ATH79=y \
CONFIG_USB_EHCI_BCM63XX=y \
@@ -140,10 +140,10 @@ $(eval $(call KernelPackage,usb2))
define KernelPackage/usb2-pci
TITLE:=Support for PCI USB2 controllers
- DEPENDS:=@PCI_SUPPORT @LINUX_3_8
+ DEPENDS:=@PCI_SUPPORT @LINUX_3_8 +kmod-usb2
KCONFIG:=CONFIG_USB_EHCI_PCI
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
- AUTOLOAD:=$(call AutoLoad,40,ehci-pci,1)
+ AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
$(call AddDepends/usb)
endef