Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / indirect_pci.c

diff --git a/arch/ppc/syslib/indirect_pci.c b/arch/ppc/syslib/indirect_pci.c
index e71488469704bbea18077cbf903871b72d34afeb..83b323a7d0296e4b98a6c71a6b40e99c3a9395b3 100644 (file)
--- a/arch/ppc/syslib/indirect_pci.c
+++ b/arch/ppc/syslib/indirect_pci.c
@@ -37,12 +37,12 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
        if (ppc_md.pci_exclude_device)
                if (ppc_md.pci_exclude_device(bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
-       
+
        if (hose->set_cfg_type)
                if (bus->number != hose->first_busno)
                        cfg_type = 1;
 
-       PCI_CFG_OUT(hose->cfg_addr,                                      
+       PCI_CFG_OUT(hose->cfg_addr,
                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
 
@@ -81,7 +81,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                if (bus->number != hose->first_busno)
                        cfg_type = 1;
 
-       PCI_CFG_OUT(hose->cfg_addr,                                      
+       PCI_CFG_OUT(hose->cfg_addr,
                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));