diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/linux/pci_ids.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6a1897481942..5d5820a4cf10 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2415,6 +2415,8 @@ | |||
| 2415 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 | 2415 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 |
| 2416 | #define PCI_DEVICE_ID_INTEL_ICH7_2 0x27c0 | 2416 | #define PCI_DEVICE_ID_INTEL_ICH7_2 0x27c0 |
| 2417 | #define PCI_DEVICE_ID_INTEL_ICH7_3 0x27c1 | 2417 | #define PCI_DEVICE_ID_INTEL_ICH7_3 0x27c1 |
| 2418 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 | ||
| 2419 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd | ||
| 2418 | #define PCI_DEVICE_ID_INTEL_ICH7_5 0x27c4 | 2420 | #define PCI_DEVICE_ID_INTEL_ICH7_5 0x27c4 |
| 2419 | #define PCI_DEVICE_ID_INTEL_ICH7_6 0x27c5 | 2421 | #define PCI_DEVICE_ID_INTEL_ICH7_6 0x27c5 |
| 2420 | #define PCI_DEVICE_ID_INTEL_ICH7_7 0x27c8 | 2422 | #define PCI_DEVICE_ID_INTEL_ICH7_7 0x27c8 |