diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /include/linux/pci_ids.h | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index febc10ed3858..52a9fe08451c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2425,6 +2425,7 @@ | |||
| 2425 | #define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8 | 2425 | #define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8 |
| 2426 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 | 2426 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 |
| 2427 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 | 2427 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 |
| 2428 | #define PCI_DEVICE_ID_INTEL_TGP_LPC 0x27bc | ||
| 2428 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd | 2429 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd |
| 2429 | #define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da | 2430 | #define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da |
| 2430 | #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd | 2431 | #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd |