Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e7111eac8ebda724d1e4d9e6aaf4569744a584d5

Authored by Petko Manolov
Committed by David S. Miller
1 parent 0e2b807234
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

another pegasus usb net device 

This one removes trailing whitespace in pegasus.h and more importantly
adds new Pegasus compatible device.

Signed-off-by: Julian Brown <julian@codesourcery.com>
Signed-off-by: Petko Manolov <petkan@nucleusys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

drivers/net/usb/pegasus.h
Diff comments   View file @ e7111ea
... ... @@ -177,7 +177,7 @@
177 177 PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
178 178 DEFAULT_GPIO_RESET )
179 179 PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
180   - DEFAULT_GPIO_RESET | PEGASUS_II )
  180 + DEFAULT_GPIO_RESET | PEGASUS_II )
181 181 PEGASUS_DEV( "Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
182 182 DEFAULT_GPIO_RESET )
183 183 PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
... ... @@ -208,6 +208,8 @@
208 208 */
209 209 PEGASUS_DEV_CLASS( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
210 210 DEFAULT_GPIO_RESET | PEGASUS_II )
  211 +PEGASUS_DEV( "Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
  212 + DEFAULT_GPIO_RESET | PEGASUS_II )
211 213 PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
212 214 DEFAULT_GPIO_RESET )
213 215 PEGASUS_DEV( "Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
... ... @@ -249,7 +251,7 @@
249 251 PEGASUS_DEV( "Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
250 252 DEFAULT_GPIO_RESET | PEGASUS_II )
251 253 PEGASUS_DEV( "HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
252   - DEFAULT_GPIO_RESET | PEGASUS_II )
  254 + DEFAULT_GPIO_RESET | PEGASUS_II )
253 255 PEGASUS_DEV( "IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
254 256 DEFAULT_GPIO_RESET )
255 257 PEGASUS_DEV( "IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,