From a962381b5c424b0676c3843f1230344aa5a2cee6 Mon Sep 17 00:00:00 2001 From: Seth Heasley Date: Mon, 11 Aug 2008 17:01:50 -0700 Subject: [PATCH] --- yaml --- r: 108861 b: refs/heads/master c: 89499759dc0dd300528510f465b0bf532fc79a2a h: refs/heads/master i: 108859: b564fc29984c6317fe3bbfab4965e535ad0d6172 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/irq.c | 2 ++ trunk/include/linux/pci_ids.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8977bb8eb7c9..0829d62fcbb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dd1e9eb5cd6f79d4efda57db4e26dfa31ff9ae5 +refs/heads/master: 89499759dc0dd300528510f465b0bf532fc79a2a diff --git a/trunk/arch/x86/pci/irq.c b/trunk/arch/x86/pci/irq.c index fec0123b33a9..8e077185e185 100644 --- a/trunk/arch/x86/pci/irq.c +++ b/trunk/arch/x86/pci/irq.c @@ -590,6 +590,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route case PCI_DEVICE_ID_INTEL_ICH10_1: case PCI_DEVICE_ID_INTEL_ICH10_2: case PCI_DEVICE_ID_INTEL_ICH10_3: + case PCI_DEVICE_ID_INTEL_PCH_0: + case PCI_DEVICE_ID_INTEL_PCH_1: r->name = "PIIX/ICH"; r->get = pirq_piix_get; r->set = pirq_piix_set; diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 9ec2bcce8e83..f1624b396754 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2428,6 +2428,9 @@ #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 +#define PCI_DEVICE_ID_INTEL_PCH_0 0x3b10 +#define PCI_DEVICE_ID_INTEL_PCH_1 0x3b11 +#define PCI_DEVICE_ID_INTEL_PCH_2 0x3b30 #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5