Merge branch 'linus' into x86/pat

5 files changed, 21 insertions, 12 deletions

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8545c8a9d107..940185ecaeda 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
         },
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL385 G2",
+                .ident = "HP ProLiant DL360",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
                 },
         },
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL585 G2",
+                .ident = "HP ProLiant DL380",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
                 },
         },
 #ifdef __i386__
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
 #endif
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL385 G2",
+                .ident = "HP ProLiant DL360",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
                 },
         },
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL585 G2",
+                .ident = "HP ProLiant DL380",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
                 },
         },
         {}
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index e70b9c57b88e..b821f4462d99 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -15,7 +15,8 @@ static __init int pci_access_init(void)
         pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
-        pci_olpc_init();
+        if (!pci_olpc_init())
+                return 0;       /* skip additional checks if it's an XO */
 #endif
 #ifdef CONFIG_PCI_BIOS
         pci_pcbios_init();
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 0908fca901bf..ca8df9c260bc 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r,
                          */
                         device = PCI_DEVICE_ID_VIA_8235;
                         break;
+                case PCI_DEVICE_ID_VIA_8237:
+                        /**
+                         * Asus a7v600 bios wrongly reports 8237
+                         * as 586-compatible
+                         */
+                        device = PCI_DEVICE_ID_VIA_8237;
+                        break;
                 }
         }
 
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
index 5e7636558c02..e11e9e803d5f 100644
--- a/arch/x86/pci/olpc.c
+++ b/arch/x86/pci/olpc.c
@@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = {
         .write = pci_olpc_write,
 };
 
-void __init pci_olpc_init(void)
+int __init pci_olpc_init(void)
 {
         if (!machine_is_olpc() || olpc_has_vsa())
-                return;
+                return -ENODEV;
 
         printk(KERN_INFO "PCI: Using configuration type OLPC\n");
         raw_pci_ops = &pci_olpc_conf;
         is_lx = is_geode_lx();
+        return 0;
 }
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index f3972b12c60a..720c4c554534 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_olpc_init(void);
+extern int pci_olpc_init(void);
 
 /* pci-mmconfig.c */