Merge tag 'tty-3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[~andy/linux] / arch / x86 / pci / irq.c

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 8201165bae28c7c8023fd29f130686c9e68a2ded..372e9b8989b322e891cacc192744419a80940d8a 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -602,7 +602,9 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
        ||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
             device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
        ||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
-            device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
+            device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
+       ||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
+            device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
                r->name = "PIIX/ICH";
                r->get = pirq_piix_get;
                r->set = pirq_piix_set;