diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
| commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
| tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /include/linux/pci_ids.h | |
| parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
| parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
| -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 cd62a39ce068..9a96f0588393 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1786,6 +1786,7 @@ | |||
| 1786 | #define PCI_DEVICE_ID_TIGON3_5704 0x1648 | 1786 | #define PCI_DEVICE_ID_TIGON3_5704 0x1648 |
| 1787 | #define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 | 1787 | #define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 |
| 1788 | #define PCI_DEVICE_ID_NX2_5706 0x164a | 1788 | #define PCI_DEVICE_ID_NX2_5706 0x164a |
| 1789 | #define PCI_DEVICE_ID_NX2_5708 0x164c | ||
| 1789 | #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d | 1790 | #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d |
| 1790 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 | 1791 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 |
| 1791 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 | 1792 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 |
| @@ -1810,6 +1811,7 @@ | |||
| 1810 | #define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 | 1811 | #define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 |
| 1811 | #define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 | 1812 | #define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 |
| 1812 | #define PCI_DEVICE_ID_NX2_5706S 0x16aa | 1813 | #define PCI_DEVICE_ID_NX2_5706S 0x16aa |
| 1814 | #define PCI_DEVICE_ID_NX2_5708S 0x16ac | ||
| 1813 | #define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 | 1815 | #define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 |
| 1814 | #define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 | 1816 | #define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 |
| 1815 | #define PCI_DEVICE_ID_TIGON3_5781 0x16dd | 1817 | #define PCI_DEVICE_ID_TIGON3_5781 0x16dd |