From 9d7022270f2b361f2421f401ec2ad12507f29464 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 3 Dec 2005 20:50:51 -0800 Subject: [PATCH] --- yaml --- r: 14969 b: refs/heads/master c: 6015d2c4ca5470509d9721d7bab8d796617ed996 h: refs/heads/master i: 14967: 95eaaca93d326d7fefa5288502d52f1a77d55889 v: v3 --- [refs] | 2 +- trunk/drivers/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abd5fc3edd40..86ab42f5567b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3c3374fbf7efe9487edc53cd10436ed641983aa +refs/heads/master: 6015d2c4ca5470509d9721d7bab8d796617ed996 diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index fac1e1603097..ea410b6b7644 100644 --- a/trunk/drivers/Makefile +++ b/trunk/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/