VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / mips / pci / ops-msc.c

diff --git a/arch/mips/pci/ops-msc.c b/arch/mips/pci/ops-msc.c
index 51b16d4..11184fa 100644 (file)
--- a/arch/mips/pci/ops-msc.c
+++ b/arch/mips/pci/ops-msc.c
@@ -48,8 +48,12 @@ static int msc_pcibios_config_access(unsigned char access_type,
        unsigned char type;
        u32 intr;
 
-       if ((busnum == 0) && (PCI_SLOT(devfn) == 0))
+#ifdef CONFIG_MIPS_BOARDS_GEN
+       if ((busnum == 0) && (PCI_SLOT(devfn) == 17)) {
+               /* MIPS Core boards have SOCit connected as device 17 */
                return -1;
+       }
+#endif
 
        /* Clear status register bits. */
        MSC_WRITE(MSC01_PCI_INTSTAT,