Merge by Hand

[linux-2.6] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 1a109a6dd953d90c4bb74146ccdbc6699f02a9e4..65670be6ff1a15ac86d8213a08533cbaf498037a 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,7 +5,7 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-obj-$(CONFIG_PCI)              += pci/
+obj-$(CONFIG_PCI)              += pci/ usb/
 obj-$(CONFIG_PARISC)           += parisc/
 obj-y                          += video/
 obj-$(CONFIG_ACPI)             += acpi/