diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:25:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:25:44 -0500 |
| commit | c6c88bbde4d8b2ffe9886b7130b2e23781d424e5 (patch) | |
| tree | 47c2b61983acc6fbc42d89813729b87bbaf2aed9 /drivers/usb/net/asix.c | |
| parent | 0356dbb7fe87ba59558902e536d9f960e87353c1 (diff) | |
| parent | c8dd7709c534ab0d713aa698c99132b6c812b57c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/asix.c')
| -rw-r--r-- | drivers/usb/net/asix.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 542120ef1fd2..541181695040 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
| @@ -912,13 +912,16 @@ static const struct usb_device_id products [] = { | |||
| 912 | // ASIX AX88772 10/100 | 912 | // ASIX AX88772 10/100 |
| 913 | USB_DEVICE (0x0b95, 0x7720), | 913 | USB_DEVICE (0x0b95, 0x7720), |
| 914 | .driver_info = (unsigned long) &ax88772_info, | 914 | .driver_info = (unsigned long) &ax88772_info, |
| 915 | }, { | ||
| 916 | // Linksys USB200M Rev 2 | ||
| 917 | USB_DEVICE (0x13b1, 0x0018), | ||
| 918 | .driver_info = (unsigned long) &ax88772_info, | ||
| 915 | }, | 919 | }, |
| 916 | { }, // END | 920 | { }, // END |
| 917 | }; | 921 | }; |
| 918 | MODULE_DEVICE_TABLE(usb, products); | 922 | MODULE_DEVICE_TABLE(usb, products); |
| 919 | 923 | ||
| 920 | static struct usb_driver asix_driver = { | 924 | static struct usb_driver asix_driver = { |
| 921 | .owner = THIS_MODULE, | ||
| 922 | .name = "asix", | 925 | .name = "asix", |
| 923 | .id_table = products, | 926 | .id_table = products, |
| 924 | .probe = usbnet_probe, | 927 | .probe = usbnet_probe, |
