diff options
| author | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 02:45:43 -0400 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 02:45:43 -0400 |
| commit | 1b06e7926694178e146ff708b2c15a6da64c9765 (patch) | |
| tree | 30602fa4a854d6956f478212937726ca75ea13ce /drivers/usb/net/asix.c | |
| parent | 65e8697a12e356cd7a6ecafa1149f5c5c6a71593 (diff) | |
| parent | c972398b7871d9fb58c6a317786065a7cc6ca4be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 9b97aa6384c7..9c0eacf7055c 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
| @@ -1456,6 +1456,10 @@ static const struct usb_device_id products [] = { | |||
| 1456 | USB_DEVICE (0x07d1, 0x3c05), | 1456 | USB_DEVICE (0x07d1, 0x3c05), |
| 1457 | .driver_info = (unsigned long) &ax88772_info, | 1457 | .driver_info = (unsigned long) &ax88772_info, |
| 1458 | }, { | 1458 | }, { |
| 1459 | // DLink DUB-E100 H/W Ver B1 Alternate | ||
| 1460 | USB_DEVICE (0x2001, 0x3c05), | ||
| 1461 | .driver_info = (unsigned long) &ax88772_info, | ||
| 1462 | }, { | ||
| 1459 | // Linksys USB1000 | 1463 | // Linksys USB1000 |
| 1460 | USB_DEVICE (0x1737, 0x0039), | 1464 | USB_DEVICE (0x1737, 0x0039), |
| 1461 | .driver_info = (unsigned long) &ax88178_info, | 1465 | .driver_info = (unsigned long) &ax88178_info, |