summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-21 15:34:59 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 13:00:58 -0800
commit7dc30303342562685392c8c7aa5194e98fd27625 (patch)
tree94c0dba3fbfc97872d89c72f7406d0dc7d8950a1 /drivers
parent8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6 (diff)
PCI: Always build setup-bus when PCI is enabled
CONFIG_HOTPLUG is being removed so setup-bus always needs to be built as part of PCI. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 36f119d9c342..0c3efcffa83b 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -4,7 +4,7 @@
obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \
pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
- irq.o vpd.o
+ irq.o vpd.o setup-bus.o
obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_SYSFS) += slot.o
@@ -58,9 +58,6 @@ obj-$(CONFIG_ACPI) += pci-acpi.o
# SMBIOS provided firmware instance and labels
obj-$(CONFIG_PCI_LABEL) += pci-label.o
-# Cardbus & CompactPCI use setup-bus
-obj-$(CONFIG_HOTPLUG) += setup-bus.o
-
obj-$(CONFIG_PCI_SYSCALL) += syscall.o
obj-$(CONFIG_PCI_STUB) += pci-stub.o