aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-27 21:28:26 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-27 21:28:26 +0000
commit0492391922e93864a8339a63e76ca7006fdb8980 (patch)
treefb82da3b173212842b3d3edfcca661a29b91211c
parent6f59cd3fb8ec2a4de23b9bbc8d136a53961cc622 (diff)
downloadupstream-0492391922e93864a8339a63e76ca7006fdb8980.tar.gz
upstream-0492391922e93864a8339a63e76ca7006fdb8980.tar.bz2
upstream-0492391922e93864a8339a63e76ca7006fdb8980.zip
kernel: make usb2-pci depend on usb2 and not the other way around
SVN-Revision: 35339
-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