diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /include/linux/pci_ids.h | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a6fdbe13a245..ec3c32932620 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1367,6 +1367,7 @@ | |||
| 1367 | #define PCI_DEVICE_ID_SERVERWORKS_HE 0x0008 | 1367 | #define PCI_DEVICE_ID_SERVERWORKS_HE 0x0008 |
| 1368 | #define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 | 1368 | #define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 |
| 1369 | #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 | 1369 | #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 |
| 1370 | #define PCI_DEVICE_ID_SERVERWORKS_EPB 0x0103 | ||
| 1370 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 | 1371 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 |
| 1371 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 | 1372 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 |
| 1372 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 | 1373 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 |
| @@ -1858,16 +1859,22 @@ | |||
| 1858 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d | 1859 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d |
| 1859 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e | 1860 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e |
| 1860 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 | 1861 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 |
| 1862 | #define PCI_DEVICE_ID_TIGON3_5714S 0x1669 | ||
| 1861 | #define PCI_DEVICE_ID_TIGON3_5780 0x166a | 1863 | #define PCI_DEVICE_ID_TIGON3_5780 0x166a |
| 1862 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b | 1864 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b |
| 1863 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e | 1865 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e |
| 1866 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 | ||
| 1864 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 | 1867 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 |
| 1865 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 | 1868 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |
| 1866 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 | 1869 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 |
| 1870 | #define PCI_DEVICE_ID_TIGON3_5715S 0x1679 | ||
| 1871 | #define PCI_DEVICE_ID_TIGON3_5754 0x167a | ||
| 1867 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c | 1872 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c |
| 1868 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d | 1873 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d |
| 1869 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e | 1874 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e |
| 1875 | #define PCI_DEVICE_ID_TIGON3_5787M 0x1693 | ||
| 1870 | #define PCI_DEVICE_ID_TIGON3_5782 0x1696 | 1876 | #define PCI_DEVICE_ID_TIGON3_5782 0x1696 |
| 1877 | #define PCI_DEVICE_ID_TIGON3_5787 0x169b | ||
| 1871 | #define PCI_DEVICE_ID_TIGON3_5788 0x169c | 1878 | #define PCI_DEVICE_ID_TIGON3_5788 0x169c |
| 1872 | #define PCI_DEVICE_ID_TIGON3_5789 0x169d | 1879 | #define PCI_DEVICE_ID_TIGON3_5789 0x169d |
| 1873 | #define PCI_DEVICE_ID_TIGON3_5702X 0x16a6 | 1880 | #define PCI_DEVICE_ID_TIGON3_5702X 0x16a6 |