diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
| commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
| tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /include/linux | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9a28b312eeb4..41aa32b2869c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -911,6 +911,15 @@ | |||
| 911 | #define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022 | 911 | #define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022 |
| 912 | #define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 | 912 | #define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 |
| 913 | #define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 | 913 | #define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 |
| 914 | #define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 | ||
| 915 | #define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312 | ||
| 916 | #define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322 | ||
| 917 | #define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312 | ||
| 918 | #define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322 | ||
| 919 | #define PCI_DEVICE_ID_QLOGIC_ISP2422 0x2422 | ||
| 920 | #define PCI_DEVICE_ID_QLOGIC_ISP2432 0x2432 | ||
| 921 | #define PCI_DEVICE_ID_QLOGIC_ISP2512 0x2512 | ||
| 922 | #define PCI_DEVICE_ID_QLOGIC_ISP2522 0x2522 | ||
| 914 | 923 | ||
| 915 | #define PCI_VENDOR_ID_CYRIX 0x1078 | 924 | #define PCI_VENDOR_ID_CYRIX 0x1078 |
| 916 | #define PCI_DEVICE_ID_CYRIX_5510 0x0000 | 925 | #define PCI_DEVICE_ID_CYRIX_5510 0x0000 |