diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /include/linux/pci_ids.h | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4463ca5b8934..f719d91afd93 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2433,6 +2433,9 @@ | |||
| 2433 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a | 2433 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a |
| 2434 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 | 2434 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 |
| 2435 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 | 2435 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2436 | #define PCI_DEVICE_ID_INTEL_PCH_0 0x3b10 | ||
| 2437 | #define PCI_DEVICE_ID_INTEL_PCH_1 0x3b11 | ||
| 2438 | #define PCI_DEVICE_ID_INTEL_PCH_2 0x3b30 | ||
| 2436 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2439 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2437 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 | 2440 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 |
| 2438 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 | 2441 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 |