diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:51:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:51:48 -0800 |
commit | 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 (patch) | |
tree | 838a597782ea49356da72298626574e22351522d /include | |
parent | f3e39e67b9b6ad6a51d13be902e8341f13b93531 (diff) | |
parent | 9a8ffccf3d282ee749210232465f61e1c48b7a86 (diff) | |
download | op-kernel-dev-27266a18dc56611e2f2ec4e8aced0fe221e9b4b8.zip op-kernel-dev-27266a18dc56611e2f2ec4e8aced0fe221e9b4b8.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-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 b0b908f..92a619b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1670,6 +1670,9 @@ #define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060 #define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061 #define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 +#define PCI_DEVICE_ID_SIIG_8S_20x_550 0x2080 +#define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081 +#define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082 #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 #define PCI_VENDOR_ID_RADISYS 0x1331 |