summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-06 10:12:02 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-12-06 10:12:02 +0100
commitf38f2a2c6f32bb29bacb95acd8f8a0d6b7270fa9 (patch)
tree2aede472598487d69923875325c0e20ae68d5adf /drivers
parentMerge branch 'upstream-fixes' (diff)
parentLinux v2.6.15-rc5 (diff)
downloadlinux-f38f2a2c6f32bb29bacb95acd8f8a0d6b7270fa9.tar.xz
linux-f38f2a2c6f32bb29bacb95acd8f8a0d6b7270fa9.zip
Merge branch 'master'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index fac1e1603097..ea410b6b7644 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/