diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 17:01:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 17:01:26 -0700 |
| commit | 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4 (patch) | |
| tree | fddb2afa9f3f1c49823ee7cfa7bcc9767e888e79 /include | |
| parent | c94c0d201f1c1a62184f4f220c1615347aafbee7 (diff) | |
| parent | 056a8763fc036639441a6dc49b61e57bc632af6e (diff) | |
| download | kernel_samsung_crespo-2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4.zip kernel_samsung_crespo-2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4.tar.gz kernel_samsung_crespo-2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
| -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 27348c2..9a28b31 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1872,6 +1872,7 @@ #define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001 #define PCI_VENDOR_ID_SIIG 0x131f +#define PCI_SUBVENDOR_ID_SIIG 0x131f #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000 #define PCI_DEVICE_ID_SIIG_1S_10x_650 0x1001 #define PCI_DEVICE_ID_SIIG_1S_10x_850 0x1002 @@ -1909,6 +1910,7 @@ #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_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 #define PCI_VENDOR_ID_RADISYS 0x1331 #define PCI_DEVICE_ID_RADISYS_ENP2611 0x0030 |