diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /drivers/net/usb/asix.c | |
| parent | d035c36c58dd9183ad6aa7875dea89893faedb55 (diff) | |
| parent | 6650239a4b01077e80d5a4468562756d77afaa59 (diff) | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
Diffstat (limited to 'drivers/net/usb/asix.c')
| -rw-r--r-- | drivers/net/usb/asix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index aea4645be7f6..6140b56cce53 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
| @@ -1508,6 +1508,10 @@ static const struct usb_device_id products [] = { | |||
| 1508 | USB_DEVICE (0x0b95, 0x1780), | 1508 | USB_DEVICE (0x0b95, 0x1780), |
| 1509 | .driver_info = (unsigned long) &ax88178_info, | 1509 | .driver_info = (unsigned long) &ax88178_info, |
| 1510 | }, { | 1510 | }, { |
| 1511 | // Logitec LAN-GTJ/U2A | ||
| 1512 | USB_DEVICE (0x0789, 0x0160), | ||
| 1513 | .driver_info = (unsigned long) &ax88178_info, | ||
| 1514 | }, { | ||
| 1511 | // Linksys USB200M Rev 2 | 1515 | // Linksys USB200M Rev 2 |
| 1512 | USB_DEVICE (0x13b1, 0x0018), | 1516 | USB_DEVICE (0x13b1, 0x0018), |
| 1513 | .driver_info = (unsigned long) &ax88772_info, | 1517 | .driver_info = (unsigned long) &ax88772_info, |