microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
authorBill Pemberton <wfp5p@virginia.edu>
Wed, 21 Nov 2012 20:34:52 +0000 (15:34 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Nov 2012 20:50:21 +0000 (12:50 -0800)
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: Michal Simek <monstr@monstr.eu>
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>
arch/microblaze/pci/pci-common.c

index 4dbb5055d04b9c274796e2d9d4d832b533333d83..a1c5b996d66d0ba4e53b869210b9d662b1e2b35a 100644 (file)
@@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void)
        pci_assign_unassigned_resources();
 }
 
-#ifdef CONFIG_HOTPLUG
-
 /* This is used by the PCI hotplug driver to allocate resource
  * of newly plugged busses. We can try to consolidate with the
  * rest of the code later, for now, keep it as-is as our main
@@ -1407,8 +1405,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 
-#endif /* CONFIG_HOTPLUG */
-
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
        return pci_enable_resources(dev, mask);