diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:51:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:51:48 -0500 |
| commit | 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 (patch) | |
| tree | 838a597782ea49356da72298626574e22351522d /include/linux | |
| parent | f3e39e67b9b6ad6a51d13be902e8341f13b93531 (diff) | |
| parent | 9a8ffccf3d282ee749210232465f61e1c48b7a86 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index b0b908f583c5..92a619ba163f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1670,6 +1670,9 @@ | |||
| 1670 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060 | 1670 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060 |
| 1671 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061 | 1671 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061 |
| 1672 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 | 1672 | #define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 |
| 1673 | #define PCI_DEVICE_ID_SIIG_8S_20x_550 0x2080 | ||
| 1674 | #define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081 | ||
| 1675 | #define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082 | ||
| 1673 | #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 | 1676 | #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 |
| 1674 | 1677 | ||
| 1675 | #define PCI_VENDOR_ID_RADISYS 0x1331 | 1678 | #define PCI_VENDOR_ID_RADISYS 0x1331 |