diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /include/linux/pci_ids.h | |
| parent | 9fcaff0e660d886e9a766460adbe558dd25de31b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/iommu
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 0d0b314476c9..2886b0eb53ec 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 |