diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/linux/pci_ids.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
| -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 88de3f8ce1a2..9a96f0588393 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -519,6 +519,7 @@ | |||
| 519 | #define PCI_DEVICE_ID_MATROX_MIL 0x0519 | 519 | #define PCI_DEVICE_ID_MATROX_MIL 0x0519 |
| 520 | #define PCI_DEVICE_ID_MATROX_MYS 0x051A | 520 | #define PCI_DEVICE_ID_MATROX_MYS 0x051A |
| 521 | #define PCI_DEVICE_ID_MATROX_MIL_2 0x051b | 521 | #define PCI_DEVICE_ID_MATROX_MIL_2 0x051b |
| 522 | #define PCI_DEVICE_ID_MATROX_MYS_AGP 0x051e | ||
| 522 | #define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f | 523 | #define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f |
| 523 | #define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 | 524 | #define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 |
| 524 | #define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 | 525 | #define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 |
| @@ -1785,6 +1786,7 @@ | |||
| 1785 | #define PCI_DEVICE_ID_TIGON3_5704 0x1648 | 1786 | #define PCI_DEVICE_ID_TIGON3_5704 0x1648 |
| 1786 | #define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 | 1787 | #define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 |
| 1787 | #define PCI_DEVICE_ID_NX2_5706 0x164a | 1788 | #define PCI_DEVICE_ID_NX2_5706 0x164a |
| 1789 | #define PCI_DEVICE_ID_NX2_5708 0x164c | ||
| 1788 | #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d | 1790 | #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d |
| 1789 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 | 1791 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 |
| 1790 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 | 1792 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 |
| @@ -1809,6 +1811,7 @@ | |||
| 1809 | #define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 | 1811 | #define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 |
| 1810 | #define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 | 1812 | #define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 |
| 1811 | #define PCI_DEVICE_ID_NX2_5706S 0x16aa | 1813 | #define PCI_DEVICE_ID_NX2_5706S 0x16aa |
| 1814 | #define PCI_DEVICE_ID_NX2_5708S 0x16ac | ||
| 1812 | #define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 | 1815 | #define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 |
| 1813 | #define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 | 1816 | #define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 |
| 1814 | #define PCI_DEVICE_ID_TIGON3_5781 0x16dd | 1817 | #define PCI_DEVICE_ID_TIGON3_5781 0x16dd |