diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 15:12:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 15:12:38 +0100 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/tulip | |
| parent | netdev: remove HAVE_ leftovers (diff) | |
| parent | bonding: bond_open error return value (diff) | |
| download | linux-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.xz linux-05ba712d7eb156009753e18e5116cabd869cc6e2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tulip')
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index cbfdd9fbe005..da4fc458f90c 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -249,6 +249,7 @@ static DEFINE_PCI_DEVICE_TABLE(tulip_pci_tbl) = { { 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */ { 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */ + { 0x1414, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Microsoft MN-120 */ { 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { } /* terminate list */ }; |