diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 18:19:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 18:19:40 -0500 |
| commit | 2149bcabc5f6fd635935d57480044ba4c11bc020 (patch) | |
| tree | d0313441c6b8b39dbf3bd840627e57af92a6b929 /include | |
| parent | 2333f2120759bb2a3edcc0d32b2f310048ee610d (diff) | |
| parent | d9004eb466d03b7900ed432fecec6819012b4ed3 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
| -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 5403257ae3e7..ecc1fc1f0f04 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1992,6 +1992,7 @@ | |||
| 1992 | #define PCI_VENDOR_ID_DCI 0x6666 | 1992 | #define PCI_VENDOR_ID_DCI 0x6666 |
| 1993 | #define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 | 1993 | #define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 |
| 1994 | #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 | 1994 | #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 |
| 1995 | #define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 | ||
| 1995 | 1996 | ||
| 1996 | #define PCI_VENDOR_ID_INTEL 0x8086 | 1997 | #define PCI_VENDOR_ID_INTEL 0x8086 |
| 1997 | #define PCI_DEVICE_ID_INTEL_EESSC 0x0008 | 1998 | #define PCI_DEVICE_ID_INTEL_EESSC 0x0008 |