aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci-common.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-21 15:34:54 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:50:22 -0500
commite47034c7a1522b9572c76bb1d003d56d9f3fcb31 (patch)
tree64e1da6cb7671156b0a6067481fe2214dffe5379 /arch/powerpc/kernel/pci-common.c
parent0a6f19db99c4833ad01eccbee51812b8000d63ea (diff)
powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r--arch/powerpc/kernel/pci-common.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7f94f760dd0c..abc0d0856994 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1428,8 +1428,6 @@ void __init pcibios_resource_survey(void)
1428 ppc_md.pcibios_fixup(); 1428 ppc_md.pcibios_fixup();
1429} 1429}
1430 1430
1431#ifdef CONFIG_HOTPLUG
1432
1433/* This is used by the PCI hotplug driver to allocate resource 1431/* This is used by the PCI hotplug driver to allocate resource
1434 * of newly plugged busses. We can try to consolidate with the 1432 * of newly plugged busses. We can try to consolidate with the
1435 * rest of the code later, for now, keep it as-is as our main 1433 * rest of the code later, for now, keep it as-is as our main
@@ -1488,8 +1486,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
1488} 1486}
1489EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); 1487EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
1490 1488
1491#endif /* CONFIG_HOTPLUG */
1492
1493int pcibios_enable_device(struct pci_dev *dev, int mask) 1489int pcibios_enable_device(struct pci_dev *dev, int mask)
1494{ 1490{
1495 if (ppc_md.pcibios_enable_device_hook) 1491 if (ppc_md.pcibios_enable_device_hook)