1 files changed, 3 insertions, 8 deletions

diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index 48f17e23d771..8118417b7364 100644
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -33,10 +33,8 @@
 #define DBG(x...)
 #endif
 
-int mpc85xx_pci2_busno = 0;
-
 #ifdef CONFIG_PCI
-int __init add_bridge(struct device_node *dev)
+int __init mpc85xx_add_bridge(struct device_node *dev)
 {
         int len;
         struct pci_controller *hose;
@@ -57,11 +55,10 @@ int __init add_bridge(struct device_node *dev)
                        " bus 0\n", dev->full_name);
         }
 
-        hose = pcibios_alloc_controller();
+        pci_assign_all_buses = 1;
+        hose = pcibios_alloc_controller(dev);
         if (!hose)
                 return -ENOMEM;
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
 
         hose->first_busno = bus_range ? bus_range[0] : 0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -74,8 +71,6 @@ int __init add_bridge(struct device_node *dev)
         if ((rsrc.start & 0xfffff) == 0x9000) {
                 setup_indirect_pci(hose, immr + 0x9000, immr + 0x9004);
                 primary = 0;
-                hose->bus_offset = hose->first_busno;
-                mpc85xx_pci2_busno = hose->first_busno;
         }
 
         printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "