Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / arch / x86 / pci / mmconfig-shared.c

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 750c346..301e325 100644 (file)
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
        if (cfg->address < 0xFFFFFFFF)
                return 0;
 
-       if (!strcmp(mcfg->header.oem_id, "SGI"))
+       if (!strcmp(mcfg->header.oem_id, "SGI") ||
+                       !strcmp(mcfg->header.oem_id, "SGI2"))
                return 0;
 
        if (mcfg->header.revision >= 1) {