aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/83xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/platforms/83xx')
-rw-r--r--arch/powerpc/platforms/83xx/pci.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index f92e71f2ed6b..8da935c6e269 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -33,15 +33,10 @@
33#define DBG(x...) 33#define DBG(x...)
34#endif 34#endif
35 35
36int mpc83xx_pci2_busno;
37
38int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) 36int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
39{ 37{
40 if (bus == 0 && PCI_SLOT(devfn) == 0) 38 if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0)
41 return PCIBIOS_DEVICE_NOT_FOUND; 39 return PCIBIOS_DEVICE_NOT_FOUND;
42 if (mpc83xx_pci2_busno)
43 if (bus == (mpc83xx_pci2_busno) && PCI_SLOT(devfn) == 0)
44 return PCIBIOS_DEVICE_NOT_FOUND;
45 return PCIBIOS_SUCCESSFUL; 40 return PCIBIOS_SUCCESSFUL;
46} 41}
47 42
@@ -86,7 +81,6 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
86 setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384); 81 setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
87 primary = 0; 82 primary = 0;
88 hose->bus_offset = hose->first_busno; 83 hose->bus_offset = hose->first_busno;
89 mpc83xx_pci2_busno = hose->first_busno;
90 } 84 }
91 85
92 printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. " 86 printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "