USB: don't build PCI quirks if USB support isn't configured

The USB PCI quirks code gets built into the kernel whenever CONFIG_PCI
is enabled, even if CONFIG_USB is not set.  This can cause unnecessary
messages to show up in the kernel log, such as "CONFIG_USB_XHCI_HCD is
turned off, defaulting to EHCI" (which makes no sense when the kernel
has been configured without host-side USB support).

This patch addresses the problem by building pci-quirks.o only when
CONFIG_PCI and CONFIG_USB are both enabled.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 65b0b6a5859977c087b046f1450d8815a8f24c37..972a74a6f428faa816d2c2cac587a4f468733c3d 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -24,7 +24,9 @@ endif
 
 obj-$(CONFIG_USB_WHCI_HCD)     += whci/
 
-obj-$(CONFIG_PCI)              += pci-quirks.o
+ifneq ($(CONFIG_USB), )
+       obj-$(CONFIG_PCI)       += pci-quirks.o
+endif
 
 obj-$(CONFIG_USB_XHCI_PCI)     += xhci-pci.o
 obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o