summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:19:40 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:19:40 -0800
commit2149bcabc5f6fd635935d57480044ba4c11bc020 (patch)
treed0313441c6b8b39dbf3bd840627e57af92a6b929 /include
parent2333f2120759bb2a3edcc0d32b2f310048ee610d (diff)
parentd9004eb466d03b7900ed432fecec6819012b4ed3 (diff)
downloadlinux-3.10-2149bcabc5f6fd635935d57480044ba4c11bc020.tar.gz
linux-3.10-2149bcabc5f6fd635935d57480044ba4c11bc020.tar.bz2
linux-3.10-2149bcabc5f6fd635935d57480044ba4c11bc020.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5403257ae3e..ecc1fc1f0f0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1992,6 +1992,7 @@
#define PCI_VENDOR_ID_DCI 0x6666
#define PCI_DEVICE_ID_DCI_PCCOM4 0x0001
#define PCI_DEVICE_ID_DCI_PCCOM8 0x0002
+#define PCI_DEVICE_ID_DCI_PCCOM2 0x0004
#define PCI_VENDOR_ID_INTEL 0x8086
#define PCI_DEVICE_ID_INTEL_EESSC 0x0008