Merge branch 'linus' into x86/cleanups

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 7300567e480b..f0859de23e20 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -616,6 +616,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;
                 }
         }