Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / arch / ppc / syslib / m82xx_pci.c

diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
index 9db58c5..1d1c395 100644 (file)
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -302,11 +302,11 @@ pq2ads_setup_pci(struct pci_controller *hose)
 
 void __init pq2_find_bridges(void)
 {
-       extern int pci_assign_all_busses;
+       extern int pci_assign_all_buses;
        struct pci_controller * hose;
        int host_bridge;
 
-       pci_assign_all_busses = 1;
+       pci_assign_all_buses = 1;
 
        hose = pcibios_alloc_controller();