diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-21 15:34:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:53:46 -0500 |
commit | b40b97ae736cad3084b13d2969b10c474572de89 (patch) | |
tree | dd2a4e0a95c1da764a3b17056b5be1a4d631c18d /drivers/pci/probe.c | |
parent | 8c610c120fb6ea279e8d01ce7aa555da29e59374 (diff) |
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>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ec909afa90b6..034cb1c73092 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1864,7 +1864,6 @@ struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, | |||
1864 | } | 1864 | } |
1865 | EXPORT_SYMBOL(pci_scan_bus); | 1865 | EXPORT_SYMBOL(pci_scan_bus); |
1866 | 1866 | ||
1867 | #ifdef CONFIG_HOTPLUG | ||
1868 | /** | 1867 | /** |
1869 | * pci_rescan_bus_bridge_resize - scan a PCI bus for devices. | 1868 | * pci_rescan_bus_bridge_resize - scan a PCI bus for devices. |
1870 | * @bridge: PCI bridge for the bus to scan | 1869 | * @bridge: PCI bridge for the bus to scan |
@@ -1894,7 +1893,6 @@ EXPORT_SYMBOL(pci_add_new_bus); | |||
1894 | EXPORT_SYMBOL(pci_scan_slot); | 1893 | EXPORT_SYMBOL(pci_scan_slot); |
1895 | EXPORT_SYMBOL(pci_scan_bridge); | 1894 | EXPORT_SYMBOL(pci_scan_bridge); |
1896 | EXPORT_SYMBOL_GPL(pci_scan_child_bus); | 1895 | EXPORT_SYMBOL_GPL(pci_scan_child_bus); |
1897 | #endif | ||
1898 | 1896 | ||
1899 | static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b) | 1897 | static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b) |
1900 | { | 1898 | { |