--- drivers/usb/host/Makefile.orig	2006-01-24 12:28:11.000000000 +0100
+++ drivers/usb/host/Makefile	2006-01-24 12:27:38.000000000 +0100
@@ -2,7 +2,15 @@
 # Makefile for USB Host Controller Drivers
 #
 
-obj-$(CONFIG_PCI)		+= pci-quirks.o
+# only compile pci-quirks if PCI is enabled
+# and USB is either compiled as a module
+ifeq ($(CONFIG_USB),m)
+	obj-$(CONFIG_PCI)		+= pci-quirks.o
+endif
+# or directly into the kernel
+ifeq ($(CONFIG_USB),y)
+        obj-$(CONFIG_PCI)               += pci-quirks.o
+endif
 
 obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
 obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o