diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-10 02:10:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-10 02:10:46 -0700 |
| commit | 1ce351789ad5ea21ff9a9d451cc3b3e292cce425 (patch) | |
| tree | 65ffd44fbc3a4f6eb6138e16d174bc00d2d985e0 /include/linux | |
| parent | c8c391f74a7375e88dc29083d7ba994a727a87cc (diff) | |
| parent | 50f61b559714162907ab34467efefb1884385300 (diff) | |
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -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 8e3bbbe83f10..9f13d1e7b9e1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -435,7 +435,9 @@ #define PCI_DEVICE_ID_IBM_CPC710_PCI64 0x00fc #define PCI_DEVICE_ID_IBM_CPC710_PCI32 0x0105 #define PCI_DEVICE_ID_IBM_405GP 0x0156 +#define PCI_DEVICE_ID_IBM_SNIPE 0x0180 #define PCI_DEVICE_ID_IBM_SERVERAIDI960 0x01bd +#define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 #define PCI_DEVICE_ID_IBM_MPIC_2 0xffff #define PCI_VENDOR_ID_COMPEX2 0x101a // pci.ids says "AT&T GIS (NCR)" |