diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /arch/i386/pci/irq.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/pci/irq.c')
| -rw-r--r-- | arch/i386/pci/irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index e07589d04f64..d6598da4b67b 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -495,6 +495,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 495 | case PCI_DEVICE_ID_INTEL_ICH6_1: | 495 | case PCI_DEVICE_ID_INTEL_ICH6_1: |
| 496 | case PCI_DEVICE_ID_INTEL_ICH7_0: | 496 | case PCI_DEVICE_ID_INTEL_ICH7_0: |
| 497 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 497 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
| 498 | case PCI_DEVICE_ID_INTEL_ICH7_30: | ||
| 499 | case PCI_DEVICE_ID_INTEL_ICH7_31: | ||
| 498 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 500 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
| 499 | r->name = "PIIX/ICH"; | 501 | r->name = "PIIX/ICH"; |
| 500 | r->get = pirq_piix_get; | 502 | r->get = pirq_piix_get; |