aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 18:54:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 18:54:17 -0400
commit9539ce2253ab1b054e9b0daf0abe0fd4263e1820 (patch)
tree3d499436eef8fb5f9bceb668eb8338a0f135308c /drivers/net/usb
parentc2b38989cf2b0c003a9cf57efc833ab16d33901e (diff)
parent096a458c3a9c717563e98b0a2ce69821459a6660 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: forcedeth: fix cpu irq mask chelsio parenthesis fix spidernet: skb used after netif_receive_skb meth driver renovation remove unnecessary dependency on VIA velocity config fix compiler warning in fixed.c asix.c - Add Belkin F5D5055 ids ucc_geth:trivial fix ucc_geth: Fix MODULE_DEVICE_TABLE() duplication [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check [PATCH] libertas: skb dereferenced after netif_rx
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index d5ef97bc4d01..6d95cacd5284 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1458,6 +1458,10 @@ static const struct usb_device_id products [] = {
1458 // IO-DATA ETG-US2 1458 // IO-DATA ETG-US2
1459 USB_DEVICE (0x04bb, 0x0930), 1459 USB_DEVICE (0x04bb, 0x0930),
1460 .driver_info = (unsigned long) &ax88178_info, 1460 .driver_info = (unsigned long) &ax88178_info,
1461}, {
1462 // Belkin F5D5055
1463 USB_DEVICE(0x050d, 0x5055),
1464 .driver_info = (unsigned long) &ax88178_info,
1461}, 1465},
1462 { }, // END 1466 { }, // END
1463}; 1467};