[SCSI] mpt fusion: Changes in mptctl.c for logging support

[safe/jmp/linux-2.6] / arch / powerpc / platforms / 85xx / pci.c

diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index be67f67..8118417 100644 (file)
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -55,10 +55,10 @@ int __init mpc85xx_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->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -71,7 +71,6 @@ int __init mpc85xx_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;
        }
 
        printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "