From 356327ec156ef4f984720cc6ab893cceb9a17d91 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Wed, 21 Nov 2012 15:34:52 -0500 Subject: [PATCH] --- yaml --- r: 336923 b: refs/heads/master c: d5174d2d2a775998972c04f9875daf04fb156180 h: refs/heads/master i: 336921: 2553d96f51621936913af849bbbe37009eec78d2 336919: 3e311fe111ae8910e36fd25c7e4b0f476d4e8c1c v: v3 --- [refs] | 2 +- trunk/arch/microblaze/pci/pci-common.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 096f36a63bd4..258b249cc392 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 463a1f8b3ceebe990ca9a8c7cc2e51ee42cb48eb +refs/heads/master: d5174d2d2a775998972c04f9875daf04fb156180 diff --git a/trunk/arch/microblaze/pci/pci-common.c b/trunk/arch/microblaze/pci/pci-common.c index 4dbb5055d04b..a1c5b996d66d 100644 --- a/trunk/arch/microblaze/pci/pci-common.c +++ b/trunk/arch/microblaze/pci/pci-common.c @@ -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);