summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-26 14:02:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-26 14:02:49 -0700
commite02fd44056dd8077b49b4bd92c5799a75e89cd65 (patch)
tree3ba1071bbc9a733e2051da9615a157c0bb292e59 /include
parentdd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07 (diff)
parent551f8f0e87becb415c522adccab524a7a05ca83a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f74ed946247..71834f05504 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -723,6 +723,7 @@
#define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
+#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a
#define PCI_DEVICE_ID_HP_CISS 0x3210
#define PCI_DEVICE_ID_HP_CISSA 0x3220
#define PCI_DEVICE_ID_HP_CISSB 0x3222
@@ -2696,6 +2697,7 @@
#define PCI_SUBVENDOR_ID_EXSYS 0xd84d
#define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014
+#define PCI_SUBDEVICE_ID_EXSYS_4055 0x4055
#define PCI_VENDOR_ID_TIGERJET 0xe159
#define PCI_DEVICE_ID_TIGERJET_300 0x0001