diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /arch/i386/pci | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'arch/i386/pci')
| -rw-r--r-- | arch/i386/pci/irq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 187350ccf864..86348b68fda1 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -551,6 +551,13 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 551 | static __init int via_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 551 | static __init int via_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 552 | { | 552 | { |
| 553 | /* FIXME: We should move some of the quirk fixup stuff here */ | 553 | /* FIXME: We should move some of the quirk fixup stuff here */ |
| 554 | |||
| 555 | if (router->device == PCI_DEVICE_ID_VIA_82C686 && | ||
| 556 | device == PCI_DEVICE_ID_VIA_82C586_0) { | ||
| 557 | /* Asus k7m bios wrongly reports 82C686A as 586-compatible */ | ||
| 558 | device = PCI_DEVICE_ID_VIA_82C686; | ||
| 559 | } | ||
| 560 | |||
| 554 | switch(device) | 561 | switch(device) |
| 555 | { | 562 | { |
| 556 | case PCI_DEVICE_ID_VIA_82C586_0: | 563 | case PCI_DEVICE_ID_VIA_82C586_0: |