Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

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

diff --git a/arch/ppc/syslib/ppc405_pci.c b/arch/ppc/syslib/ppc405_pci.c
index 81c83bf98df49fb10a20e953b422464eb42d7ce4..9e9035693bfaa085328ec13d33a9419b7fa43c3f 100644 (file)
--- a/arch/ppc/syslib/ppc405_pci.c
+++ b/arch/ppc/syslib/ppc405_pci.c
@@ -89,13 +89,6 @@ ppc4xx_find_bridges(void)
        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)
@@ -144,7 +137,7 @@ ppc4xx_find_bridges(void)
        hose_a->pci_mem_offset = 0;
 
        /* Setup bridge memory/IO ranges & resources
-        * TODO: Handle firmwares setting up a legacy ISA mem base
+        * TODO: Handle firmware setting up a legacy ISA mem base
         */
        hose_a->io_space.start = PPC405_PCI_LOWER_IO;
        hose_a->io_space.end = PPC405_PCI_UPPER_IO;