summaryrefslogtreecommitdiffstats
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorJames Bottomley2012-10-02 09:55:12 +0200
committerJames Bottomley2012-10-02 09:55:12 +0200
commitfe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch)
treec5a7fd72a745a5f6656a58acc9a1d277e26f9595 /include/linux/pci_ids.h
parentMerge tag 'isci-for-3.6' into for-next (diff)
parent[SCSI] st: remove st_mutex (diff)
downloadkernel-qcow2-linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.gz
kernel-qcow2-linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.xz
kernel-qcow2-linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.zip
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'include/linux/pci_ids.h')
-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 6b4565c440c8..416db39d484b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -753,6 +753,7 @@
#define PCI_DEVICE_ID_HP_CISSD 0x3238
#define PCI_DEVICE_ID_HP_CISSE 0x323a
#define PCI_DEVICE_ID_HP_CISSF 0x323b
+#define PCI_DEVICE_ID_HP_CISSH 0x323c
#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
#define PCI_VENDOR_ID_PCTECH 0x1042