diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-12-30 19:24:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-12-30 19:24:42 -0800 |
| commit | 00ecacba3d0c9de12c390b714f023aaa9aeff9b6 (patch) | |
| tree | fbc72ecebfd2d06d168117b5e4e7d253ffafb6cc /include/linux | |
| parent | cdd7785031af00ace6d5ae8a2fb605ede0737606 (diff) | |
| parent | f0cb1c029abcca714601e67a266a942437c66d00 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -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 2bb780251def..2e186a3a7f3e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1785,11 +1785,13 @@ #define PCI_DEVICE_ID_TIGON3_5702 0x1646 #define PCI_DEVICE_ID_TIGON3_5703 0x1647 #define PCI_DEVICE_ID_TIGON3_5704 0x1648 +#define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d #define PCI_DEVICE_ID_TIGON3_5705 0x1653 #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 #define PCI_DEVICE_ID_TIGON3_5705M 0x165d #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e +#define PCI_DEVICE_ID_TIGON3_5705F 0x166e #define PCI_DEVICE_ID_TIGON3_5782 0x1696 #define PCI_DEVICE_ID_TIGON3_5788 0x169c #define PCI_DEVICE_ID_TIGON3_5702X 0x16a6 |