From: Bill Pemberton <wfp5p@virginia.edu>
Date: Wed, 21 Nov 2012 20:34:59 +0000 (-0500)
Subject: PCI: Always build setup-bus when PCI is enabled
X-Git-Tag: upstream/snapshot3+hdmi~6137^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dc30303342562685392c8c7aa5194e98fd27625;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 36f119d..0c3efcf 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