summaryrefslogtreecommitdiff
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2015-04-22 19:11:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-08 02:43:43 +0300
commit3091fa77ffb1b91f4ac3ae005efe6213508f7ec1 (patch)
treeca1d78c5c43e977b1e24a90a4ddb25918f7d1b91 /drivers/usb/host
parent58339c2e8b6181e6ffb2ef0dccc4d010b8acd013 (diff)
downloadlinux-3091fa77ffb1b91f4ac3ae005efe6213508f7ec1.tar.xz
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>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 65b0b6a58599..972a74a6f428 100644
--- 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