From 4c1c99632228396d4ed913b653b68440c393f8f1 Mon Sep 17 00:00:00 2001 From: Seth Heasley Date: Thu, 25 Mar 2010 16:11:37 -0700 Subject: [PATCH] --- yaml --- r: 197919 b: refs/heads/master c: 33852cb03ee4cdb05dc6e3a21ec19a4ee63511a4 h: refs/heads/master i: 197917: c961692839dcf2b958a9410ae5d2dae6b3b49898 197915: b747375ef7007f8c4116bfd6c273ac362be31fae 197911: 34715abdfad1a104af5bd8a22b3acbe2a8ef9016 197903: 88193f5cd3a4cfef418635147b9331ab5c6dd904 197887: 0c558c4ce7f5464467b0fd033079e50123723687 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/irq.c | 9 +++++++-- trunk/include/linux/pci_ids.h | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0260df7da3f2..84048fbd15e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caa5afbd4831c649b951ae1227a7985f47547e31 +refs/heads/master: 33852cb03ee4cdb05dc6e3a21ec19a4ee63511a4 diff --git a/trunk/arch/x86/pci/irq.c b/trunk/arch/x86/pci/irq.c index 5d362b5ba06f..9810a0f76c91 100644 --- a/trunk/arch/x86/pci/irq.c +++ b/trunk/arch/x86/pci/irq.c @@ -589,8 +589,6 @@ 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; @@ -605,6 +603,13 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route return 1; } + if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && + (device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) { + r->name = "PIIX/ICH"; + r->get = pirq_piix_get; + r->set = pirq_piix_set; + return 1; + } return 0; } diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 9f688d243b86..ae66851870be 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2419,8 +2419,8 @@ #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_CPT_LPC_MIN 0x1c41 +#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX 0x1c5f #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413