diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 17:26:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 17:26:03 -0400 |
| commit | 94b1661d08a27a8d2b1b0127c272987b0ab4ad6a (patch) | |
| tree | 770f24b91cefd9bb689cf9af0df32fb0e92c34b2 /arch | |
| parent | 4e9a4b71f1eb23f35c394eb2b388dbe0389d316a (diff) | |
| parent | 75cf7456dd87335f574dcd53c4ae616a2ad71a11 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
[PATCH] PCI quirk: VIA IRQ fixup should only run for VIA southbridges
[PATCH] PCI: fix potential resource leak in drivers/pci/msi.c
[PATCH] PCI: Documentation: no more device ids
[PATCH] PCI: fix via irq SATA patch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/pci/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 73235443fda7..06dab00aaadc 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -591,7 +591,6 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 591 | case PCI_DEVICE_ID_VIA_8233A: | 591 | case PCI_DEVICE_ID_VIA_8233A: |
| 592 | case PCI_DEVICE_ID_VIA_8235: | 592 | case PCI_DEVICE_ID_VIA_8235: |
| 593 | case PCI_DEVICE_ID_VIA_8237: | 593 | case PCI_DEVICE_ID_VIA_8237: |
| 594 | case PCI_DEVICE_ID_VIA_8237_SATA: | ||
| 595 | /* FIXME: add new ones for 8233/5 */ | 594 | /* FIXME: add new ones for 8233/5 */ |
| 596 | r->name = "VIA"; | 595 | r->name = "VIA"; |
| 597 | r->get = pirq_via_get; | 596 | r->get = pirq_via_get; |