Merge branch 'for-2.6.23' into merge

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 2153163fa593..90db8a720fed 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -64,9 +64,10 @@ tsi108_direct_write_config(struct pci_bus *bus, unsigned int devfunc,
                            int offset, int len, u32 val)
 {
         volatile unsigned char *cfg_addr;
+        struct pci_controller *hose = bus->sysdata;
 
         if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfunc))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfunc))
                         return PCIBIOS_DEVICE_NOT_FOUND;
 
         cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus->number,
@@ -149,10 +150,11 @@ tsi108_direct_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                           int len, u32 * val)
 {
         volatile unsigned char *cfg_addr;
+        struct pci_controller *hose = bus->sysdata;
         u32 temp;
 
         if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                         return PCIBIOS_DEVICE_NOT_FOUND;
 
         cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus->number,
@@ -219,14 +221,12 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary)
                        " bus 0\n", dev->full_name);
         }
 
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(dev);
 
         if (!hose) {
                 printk("PCI Host bridge init failed\n");
                 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;