diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /include/linux/pci_ids.h | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
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 4e06eb0f4451..d00f8ba7f22b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -442,6 +442,7 @@ | |||
| 442 | #define PCI_DEVICE_ID_IBM_SNIPE 0x0180 | 442 | #define PCI_DEVICE_ID_IBM_SNIPE 0x0180 |
| 443 | #define PCI_DEVICE_ID_IBM_CITRINE 0x028C | 443 | #define PCI_DEVICE_ID_IBM_CITRINE 0x028C |
| 444 | #define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 | 444 | #define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 |
| 445 | #define PCI_DEVICE_ID_IBM_OBSIDIAN 0x02BD | ||
| 445 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 | 446 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 |
| 446 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 | 447 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 |
| 447 | #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A | 448 | #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A |
| @@ -2147,6 +2148,7 @@ | |||
| 2147 | #define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 | 2148 | #define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 |
| 2148 | #define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 | 2149 | #define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 |
| 2149 | #define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf | 2150 | #define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf |
| 2151 | #define PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN 0x0500 | ||
| 2150 | #define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 | 2152 | #define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 |
| 2151 | 2153 | ||
| 2152 | 2154 | ||