Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 83xx / pci.c

diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index c0e2b89154e540457aa9e1fbfacab905870e7d56..80425d7b14f8b0b24376a1de86458c61a163684e 100644 (file)
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -33,13 +33,6 @@
 #define DBG(x...)
 #endif
 
-int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
-{
-       if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       return PCIBIOS_SUCCESSFUL;
-}
-
 int __init mpc83xx_add_bridge(struct device_node *dev)
 {
        int len;
@@ -74,11 +67,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
         */
        /* PCI 1 */
        if ((rsrc.start & 0xfffff) == 0x8500) {
-               setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304);
+               setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);
        }
        /* PCI 2 */
        if ((rsrc.start & 0xfffff) == 0x8600) {
-               setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
+               setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);
                primary = 0;
        }