From 95e3ba9772331502cc33f1e1d4a96f3310e2f31e Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Fri, 13 Oct 2017 21:35:41 +0300 Subject: 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 [bhelgaas: convert printk to dev_err()] Signed-off-by: Bjorn Helgaas --- drivers/pci/Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/pci/Makefile') 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 -- cgit v1.2.3-59-g8ed1b