aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-08-06 11:19:19 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2015-08-06 11:19:19 +1000
commitcafc46def69dfe708a17a19eaffc0b82efb71991 (patch)
tree3723424dfb010538e5597d1885fc0d98b4afc8e4 /arch/microblaze
parentcd7c329fd1af35fd401de915826ad8dd658321e4 (diff)
parent5a4f3cf0d1f02884c0a64488d22b3bb4bce31b44 (diff)
Merge remote-tracking branch 'pci/next'
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/pci/pci-common.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index ae838ed5fcf2..6b8b75266801 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -863,14 +863,7 @@ void pcibios_setup_bus_devices(struct pci_bus *bus)
void pcibios_fixup_bus(struct pci_bus *bus)
{
- /* When called from the generic PCI probe, read PCI<->PCI bridge
- * bases. This is -not- called when generating the PCI tree from
- * the OF device-tree.
- */
- if (bus->self != NULL)
- pci_read_bridge_bases(bus);
-
- /* Now fixup the bus bus */
+ /* Fixup the bus */
pcibios_setup_bus_self(bus);
/* Now fixup devices on that bus */