Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / arch / x86 / pci / irq.c

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 87e6c83..8201165 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -597,21 +597,18 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
+       if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN && 
+            device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX) 
+       ||  (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)) {
                r->name = "PIIX/ICH";
                r->get = pirq_piix_get;
                r->set = pirq_piix_set;
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
-               r->name = "PIIX/ICH";
-               r->get = pirq_piix_get;
-               r->set = pirq_piix_set;
-               return 1;
-       }
        return 0;
 }