diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-03 15:07:10 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-03 15:07:10 (GMT) |
commit | 7d6322b4659216fff76619d3b4088eecbdfa46d5 (patch) | |
tree | 19aa385d903fcc0f2b5d6d978dc83a87c2eca95f /include/linux/pci_ids.h | |
parent | d6b9acc0c6c4a7c5d484d15271a5274656d0864f (diff) | |
parent | 51c928c34fa7cff38df584ad01de988805877dba (diff) | |
download | linux-fsl-qoriq-7d6322b4659216fff76619d3b4088eecbdfa46d5.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index eb36fd2..f74ed94 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -185,6 +185,7 @@ #define PCI_DEVICE_ID_LSI_61C102 0x0901 #define PCI_DEVICE_ID_LSI_63C815 0x1000 #define PCI_DEVICE_ID_LSI_SAS1064 0x0050 +#define PCI_DEVICE_ID_LSI_SAS1064R 0x0411 #define PCI_DEVICE_ID_LSI_SAS1066 0x005E #define PCI_DEVICE_ID_LSI_SAS1068 0x0054 #define PCI_DEVICE_ID_LSI_SAS1064A 0x005C @@ -560,6 +561,7 @@ #define PCI_VENDOR_ID_DELL 0x1028 #define PCI_DEVICE_ID_DELL_RACIII 0x0008 #define PCI_DEVICE_ID_DELL_RAC4 0x0012 +#define PCI_DEVICE_ID_DELL_PERC5 0x0015 #define PCI_VENDOR_ID_MATROX 0x102B #define PCI_DEVICE_ID_MATROX_MGA_2 0x0518 |