From 23205478c0831eb8a9f30f019039bfb7cbf1d57c Mon Sep 17 00:00:00 2001 From: Seth Heasley Date: Fri, 10 Sep 2010 16:36:39 -0700 Subject: [PATCH] --- yaml --- r: 219550 b: refs/heads/master c: 25143fd1270d28782ae0620aa86ef5f8c14030fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/irq.c | 1 + trunk/include/linux/pci_ids.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8089de8d6ba5..7f889c3dc3d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80e7b19ae167197e84f378809b8ccddd0f99c1fd +refs/heads/master: 25143fd1270d28782ae0620aa86ef5f8c14030fd diff --git a/trunk/arch/x86/pci/irq.c b/trunk/arch/x86/pci/irq.c index f547ee05f715..ee7fc8fc8a83 100644 --- a/trunk/arch/x86/pci/irq.c +++ b/trunk/arch/x86/pci/irq.c @@ -589,6 +589,7 @@ 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_PBG_LPC: 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 dc2827723c1e..b9ff2801cf76 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2436,6 +2436,7 @@ #define PCI_DEVICE_ID_INTEL_CPT_SMBUS 0x1c22 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN 0x1c41 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX 0x1c5f +#define PCI_DEVICE_ID_INTEL_PBG_LPC 0x1d40 #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413