openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

microblaze/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: 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>
This commit is contained in:
Bill Pemberton 2012-11-21 15:34:52 -05:00 committed by Greg Kroah-Hartman
parent 463a1f8b3c
commit d5174d2d2a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/pci/pci-common.c
View File

@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void)
pci_assign_unassigned_resources(); pci_assign_unassigned_resources();
} }
#ifdef CONFIG_HOTPLUG
/* This is used by the PCI hotplug driver to allocate resource /* This is used by the PCI hotplug driver to allocate resource
* of newly plugged busses. We can try to consolidate with the * 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 * 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); EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
#endif /* CONFIG_HOTPLUG */
int pcibios_enable_device(struct pci_dev *dev, int mask) int pcibios_enable_device(struct pci_dev *dev, int mask)
{ {
return pci_enable_resources(dev, mask); return pci_enable_resources(dev, mask);