aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2005-06-27 17:36:48 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:11:48 -0400
commit3de0a70bd926ff974adb27a38d4fd1049f05e54e (patch)
treef925e47d5c842616d1a293c31c5bcbbecdf64f73 /include
parent21c121ccd5559a07089d1aef9ca6c04c6d8b6758 (diff)
[PATCH] cciss: pci id fix
This patch fixes a PCI ID I got wrong before. It also adds support for another new SAS controller due out this summer. I didn't have a marketing name prior to my last submission. Also modifies the copyright date range. Signed-off-by: Mike Miller <mike.miller@hp.com> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3af7450278b7..a3961e1d5183 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -712,8 +712,9 @@
712#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 712#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
713#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301 713#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
714#define PCI_DEVICE_ID_HP_CISSA 0x3220 714#define PCI_DEVICE_ID_HP_CISSA 0x3220
715#define PCI_DEVICE_ID_HP_CISSB 0x3230 715#define PCI_DEVICE_ID_HP_CISSB 0x3222
716#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 716#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
717#define PCI_DEVICE_ID_HP_CISSC 0x3230
717 718
718#define PCI_VENDOR_ID_PCTECH 0x1042 719#define PCI_VENDOR_ID_PCTECH 0x1042
719#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000 720#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000