Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1aa46ec91cfd3cc4ab19780f664a3d089bb67173

Authored by Ken Kawasaki
Committed by David S. Miller
1 parent 8ea91226ec
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

... ... @@ -88,16 +88,14 @@
88 88 "IC PLUS IP1000 1000/100/10 based NIC",
89 89 "Sundance Technology ST2021 based NIC",
90 90 "Tamarack Microelectronics TC9020/9021 based NIC",
91   - "Tamarack Microelectronics TC9020/9021 based NIC",
92 91 "D-Link NIC IP1000A"
93 92 };
94 93  
95 94 static DEFINE_PCI_DEVICE_TABLE(ipg_pci_tbl) = {
96 95 { PCI_VDEVICE(SUNDANCE, 0x1023), 0 },
97 96 { PCI_VDEVICE(SUNDANCE, 0x2021), 1 },
98   - { PCI_VDEVICE(SUNDANCE, 0x1021), 2 },
99   - { PCI_VDEVICE(DLINK, 0x9021), 3 },
100   - { PCI_VDEVICE(DLINK, 0x4020), 4 },
  97 + { PCI_VDEVICE(DLINK, 0x9021), 2 },
  98 + { PCI_VDEVICE(DLINK, 0x4020), 3 },
101 99 { 0, }
102 100 };
103 101