diff options
| -rw-r--r-- | arch/x86/pci/irq.c | 15 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 87e6c832311..8201165bae2 100644 --- 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 | |||
| 597 | return 1; | 597 | return 1; |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && | 600 | if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN && |
| 601 | (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) { | 601 | device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX) |
| 602 | || (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && | ||
| 603 | device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX) | ||
| 604 | || (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN && | ||
| 605 | device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) { | ||
| 602 | r->name = "PIIX/ICH"; | 606 | r->name = "PIIX/ICH"; |
| 603 | r->get = pirq_piix_get; | 607 | r->get = pirq_piix_get; |
| 604 | r->set = pirq_piix_set; | 608 | r->set = pirq_piix_set; |
| 605 | return 1; | 609 | return 1; |
| 606 | } | 610 | } |
| 607 | 611 | ||
| 608 | if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && | ||
| 609 | (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) { | ||
| 610 | r->name = "PIIX/ICH"; | ||
| 611 | r->get = pirq_piix_get; | ||
| 612 | r->set = pirq_piix_set; | ||
| 613 | return 1; | ||
| 614 | } | ||
| 615 | return 0; | 612 | return 0; |
| 616 | } | 613 | } |
| 617 | 614 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3adb06ebf84..46f23999458 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2480,6 +2480,9 @@ | |||
| 2480 | #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22 | 2480 | #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22 |
| 2481 | #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0 0x1d40 | 2481 | #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0 0x1d40 |
| 2482 | #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1 0x1d41 | 2482 | #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1 0x1d41 |
| 2483 | #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310 | ||
| 2484 | #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f | ||
| 2485 | #define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330 | ||
| 2483 | #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 | 2486 | #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 |
| 2484 | #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 | 2487 | #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 |
| 2485 | #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413 | 2488 | #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413 |
