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 918796088c60893ca6cab0cfe61cf2936c973ffe which moved
the USB host controller PCI quirk handling around.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index fac1e1603097d46bcc66e076c083601cfa37c52f..ea410b6b7644fa4b7959e324ba5595019b90bfe6 100644 (file)
--- 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/