Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / syslib / ppc405_pci.c

diff --git a/arch/ppc/syslib/ppc405_pci.c b/arch/ppc/syslib/ppc405_pci.c
index 7f94bdf..d6d838b 100644 (file)
--- a/arch/ppc/syslib/ppc405_pci.c
+++ b/arch/ppc/syslib/ppc405_pci.c
@@ -82,20 +82,13 @@ ppc4xx_find_bridges(void)
        unsigned int tmp_addr;
        unsigned int tmp_size;
        unsigned int reg_index;
-       unsigned int new_pmm_max;
-       unsigned int new_pmm_min;
+       unsigned int new_pmm_max = 0;
+       unsigned int new_pmm_min = 0;
 
        isa_io_base = 0;
        isa_mem_base = 0;
        pci_dram_offset = 0;
 
-#if  (PSR_PCI_ARBIT_EN > 1)
-       /* Check if running in slave mode */
-       if ((mfdcr(DCRN_CHPSR) & PSR_PCI_ARBIT_EN) == 0) {
-               printk("Running as PCI slave, kernel PCI disabled !\n");
-               return;
-       }
-#endif
        /* Setup PCI32 hose */
        hose_a = pcibios_alloc_controller();
        if (!hose_a)