summaryrefslogtreecommitdiffstats
path: root/drivers/pci/Makefile
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2017-10-13 21:35:41 +0300
committerBjorn Helgaas <bhelgaas@google.com>2017-11-06 18:48:58 -0600
commit95e3ba9772331502cc33f1e1d4a96f3310e2f31e (patch)
treebef843c0160f1651a68b46e062cdb9c1dc400b52 /drivers/pci/Makefile
parent24a0c654d7d6063301c51361f911369264342b3c (diff)
downloadlinux-stable-95e3ba9772331502cc33f1e1d4a96f3310e2f31e.tar.gz
linux-stable-95e3ba9772331502cc33f1e1d4a96f3310e2f31e.tar.bz2
linux-stable-95e3ba9772331502cc33f1e1d4a96f3310e2f31e.zip
PCI: Move pci_hp_add_bridge() to drivers/pci/probe.c
There is not much point of having a file with a single function in it. Instead we can just move pci_hp_add_bridge() to drivers/pci/probe.c and make it available always when PCI core is enabled. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> [bhelgaas: convert printk to dev_err()] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/Makefile')
-rw-r--r--drivers/pci/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 66a21acad952..fa56267fa2c0 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -16,9 +16,6 @@ obj-$(CONFIG_PCIEPORTBUS) += pcie/
# Build the PCI Hotplug drivers if we were asked to
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
-ifdef CONFIG_HOTPLUG_PCI
-obj-y += hotplug-pci.o
-endif
# Build the PCI MSI interrupt support
obj-$(CONFIG_PCI_MSI) += msi.o