From 3022661f040a69d5d7c30211146920e8f4adfef2 Mon Sep 17 00:00:00 2001 From: Seth Heasley Date: Tue, 12 Jan 2010 16:56:37 -0800 Subject: [PATCH] --- yaml --- r: 180961 b: refs/heads/master c: 93da6202264ce1256b04db8008a43882ae62d060 h: refs/heads/master i: 180959: baed09b079e65a56130e92f543a1e092beb76f08 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 da703e327249..2bad4f344976 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93177a748ba0d4f3d3e51c8e6c785773bf6a70df +refs/heads/master: 93da6202264ce1256b04db8008a43882ae62d060 diff --git a/trunk/arch/x86/pci/irq.c b/trunk/arch/x86/pci/irq.c index 0696d506c4ad..b02f6d8ac922 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_CPT_LPC1: + case PCI_DEVICE_ID_INTEL_CPT_LPC2: 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 cca8a044e2b6..0be824320580 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2417,6 +2417,9 @@ #define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21 #define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30 #define PCI_DEVICE_ID_INTEL_IOAT 0x1a38 +#define PCI_DEVICE_ID_INTEL_CPT_SMBUS 0x1c22 +#define PCI_DEVICE_ID_INTEL_CPT_LPC1 0x1c42 +#define PCI_DEVICE_ID_INTEL_CPT_LPC2 0x1c43 #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413