diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 19:43:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 19:43:39 -0400 |
| commit | 4d7de66e2cc508761f050d1d4eaca88a6e6f711e (patch) | |
| tree | 6b9943c1fc07de4420f95fa935e470760545780c /include/linux/pci_ids.h | |
| parent | e93adf1e6554511a6194f4785fd29af8e41104db (diff) | |
| parent | a4f1bac62564049ea4718c4624b0fadc9f597c84 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 41aa32b2869c..d2ad2c4f835a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2107,6 +2107,8 @@ | |||
| 2107 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 | 2107 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 |
| 2108 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d | 2108 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d |
| 2109 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e | 2109 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e |
| 2110 | #define PCI_DEVICE_ID_TIGON3_5780 0x166a | ||
| 2111 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b | ||
| 2110 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e | 2112 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e |
| 2111 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 | 2113 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 |
| 2112 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 | 2114 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |