aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:26:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:26:03 -0700
commit94b1661d08a27a8d2b1b0127c272987b0ab4ad6a (patch)
tree770f24b91cefd9bb689cf9af0df32fb0e92c34b2 /arch
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
parent[PATCH] PCI quirk: VIA IRQ fixup should only run for VIA southbridges (diff)
downloadlinux-dev-94b1661d08a27a8d2b1b0127c272987b0ab4ad6a.tar.xz
linux-dev-94b1661d08a27a8d2b1b0127c272987b0ab4ad6a.zip
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.c1
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,
case PCI_DEVICE_ID_VIA_8233A:
case PCI_DEVICE_ID_VIA_8235:
case PCI_DEVICE_ID_VIA_8237:
- case PCI_DEVICE_ID_VIA_8237_SATA:
/* FIXME: add new ones for 8233/5 */
r->name = "VIA";
r->get = pirq_via_get;