diff options
| author | Ken Kawasaki <ken_kawasaki@spring.nifty.jp> | 2010-11-13 13:42:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-18 10:45:24 -0800 |
| commit | 1aa46ec91cfd3cc4ab19780f664a3d089bb67173 (patch) | |
| tree | 7d0d166b44d755527f705b5523bf8f6de898ecc6 /drivers/net/ipg.c | |
| parent | 8ea91226eccf6c8ab9c55054b24c21021d4d9d19 (diff) | |
| download | linux-1aa46ec91cfd3cc4ab19780f664a3d089bb67173.tar.gz linux-1aa46ec91cfd3cc4ab19780f664a3d089bb67173.tar.bz2 linux-1aa46ec91cfd3cc4ab19780f664a3d089bb67173.zip | |
ipg.c: remove id [SUNDANCE, 0x1021]
ipg.c:
The id [SUNDANCE, 0x1021] (=[0x13f0, 0x1021]) is defined
at dl2k.h and ipg.c.
But this device works better with dl2k driver.
This problem is similar with the commit
[25cca5352712561fba97bd37c495593d641c1d39
ipg: Remove device claimed by dl2k from pci id table]
at 11 Feb 2010.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipg.c')
| -rw-r--r-- | drivers/net/ipg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index dc0198092343..aa93655c3aa7 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c @@ -88,16 +88,14 @@ static const char *ipg_brand_name[] = { "IC PLUS IP1000 1000/100/10 based NIC", "Sundance Technology ST2021 based NIC", "Tamarack Microelectronics TC9020/9021 based NIC", - "Tamarack Microelectronics TC9020/9021 based NIC", "D-Link NIC IP1000A" }; static DEFINE_PCI_DEVICE_TABLE(ipg_pci_tbl) = { { PCI_VDEVICE(SUNDANCE, 0x1023), 0 }, { PCI_VDEVICE(SUNDANCE, 0x2021), 1 }, - { PCI_VDEVICE(SUNDANCE, 0x1021), 2 }, - { PCI_VDEVICE(DLINK, 0x9021), 3 }, - { PCI_VDEVICE(DLINK, 0x4020), 4 }, + { PCI_VDEVICE(DLINK, 0x9021), 2 }, + { PCI_VDEVICE(DLINK, 0x4020), 3 }, { 0, } }; |