summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-03 20:50:51 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-03 20:50:51 -0800
commit6015d2c4ca5470509d9721d7bab8d796617ed996 (patch)
treed113c63de9a576e7f5f68a30c6f67fb7d0e7fe80
parente3c3374fbf7efe9487edc53cd10436ed641983aa (diff)
downloadop-kernel-dev-6015d2c4ca5470509d9721d7bab8d796617ed996.zip
op-kernel-dev-6015d2c4ca5470509d9721d7bab8d796617ed996.tar.gz
Link USB drivers later in the kernel
We want to link the "regular" SCSI drivers before the USB storage driver, since historically we've always detected internal SCSI disks before the external USB storage modules. The link order matters for initcall ordering, and this got broken by mistake by commit 7586269c0b52970f60bb69fcb86e765fc1d72309 which moved the USB host controller PCI quirk handling around. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index fac1e16..ea410b6 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,7 +5,7 @@
# Rewritten to use lists instead of if-statements.
#
-obj-$(CONFIG_PCI) += pci/ usb/
+obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/
obj-y += video/
@@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_USB) += usb/
+obj-$(CONFIG_PCI) += usb/
obj-$(CONFIG_USB_GADGET) += usb/gadget/
obj-$(CONFIG_GAMEPORT) += input/gameport/
obj-$(CONFIG_INPUT) += input/
OpenPOWER on IntegriCloud