diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /include/linux/pci_ids.h | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (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 467a096c3b81..56192005fa4d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1788,11 +1788,13 @@ | |||
| 1788 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 | 1788 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 |
| 1789 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d | 1789 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d |
| 1790 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e | 1790 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e |
| 1791 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 | ||
| 1791 | #define PCI_DEVICE_ID_TIGON3_5780 0x166a | 1792 | #define PCI_DEVICE_ID_TIGON3_5780 0x166a |
| 1792 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b | 1793 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b |
| 1793 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e | 1794 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e |
| 1794 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 | 1795 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 |
| 1795 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 | 1796 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |
| 1797 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 | ||
| 1796 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c | 1798 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c |
| 1797 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d | 1799 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d |
| 1798 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e | 1800 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e |