Merge branch 'master' into tk71

[mv-sheeva.git] / arch / x86 / pci / irq.c

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index f547ee05f7150aa30a1b3f052e22a6e959e17b5d..87e6c83231172f8bc70bb389b03f498dd0b28c7a 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -584,27 +584,29 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
        case PCI_DEVICE_ID_INTEL_ICH9_3:
        case PCI_DEVICE_ID_INTEL_ICH9_4:
        case PCI_DEVICE_ID_INTEL_ICH9_5:
-       case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
+       case PCI_DEVICE_ID_INTEL_EP80579_0:
        case PCI_DEVICE_ID_INTEL_ICH10_0:
        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_PATSBURG_LPC_0:
+       case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1:
                r->name = "PIIX/ICH";
                r->get = pirq_piix_get;
                r->set = pirq_piix_set;
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
+       if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+               (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
                r->name = "PIIX/ICH";
                r->get = pirq_piix_get;
                r->set = pirq_piix_set;
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+       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;