diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /drivers/usb/net/asix.c | |
parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/usb/net/asix.c')
-rw-r--r-- | drivers/usb/net/asix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 541181695040..3094970615cb 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
@@ -916,6 +916,10 @@ static const struct usb_device_id products [] = { | |||
916 | // Linksys USB200M Rev 2 | 916 | // Linksys USB200M Rev 2 |
917 | USB_DEVICE (0x13b1, 0x0018), | 917 | USB_DEVICE (0x13b1, 0x0018), |
918 | .driver_info = (unsigned long) &ax88772_info, | 918 | .driver_info = (unsigned long) &ax88772_info, |
919 | }, { | ||
920 | // 0Q0 cable ethernet | ||
921 | USB_DEVICE (0x1557, 0x7720), | ||
922 | .driver_info = (unsigned long) &ax88772_info, | ||
919 | }, | 923 | }, |
920 | { }, // END | 924 | { }, // END |
921 | }; | 925 | }; |