diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
| commit | 83fe628e16d84efc8df2731bc403eae4e4f53801 (patch) | |
| tree | 9a51c292235621d0f4f632c2a55ddb5a6ab582af /drivers/net/usb/asix.c | |
| parent | 853a0231e057c04255a848f6998f84faaa635c58 (diff) | |
| parent | 426f1af947c61dee48a9267f84bff227e503a547 (diff) | |
Merge branch 'renesas/soc' into next/soc2
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 8e84f5bdd6ca..d6da5eed5453 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
| @@ -1599,6 +1599,10 @@ static const struct usb_device_id products [] = { | |||
| 1599 | USB_DEVICE (0x6189, 0x182d), | 1599 | USB_DEVICE (0x6189, 0x182d), |
| 1600 | .driver_info = (unsigned long) &ax8817x_info, | 1600 | .driver_info = (unsigned long) &ax8817x_info, |
| 1601 | }, { | 1601 | }, { |
| 1602 | // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter" | ||
| 1603 | USB_DEVICE (0x0df6, 0x0056), | ||
| 1604 | .driver_info = (unsigned long) &ax88178_info, | ||
| 1605 | }, { | ||
| 1602 | // corega FEther USB2-TX | 1606 | // corega FEther USB2-TX |
| 1603 | USB_DEVICE (0x07aa, 0x0017), | 1607 | USB_DEVICE (0x07aa, 0x0017), |
| 1604 | .driver_info = (unsigned long) &ax8817x_info, | 1608 | .driver_info = (unsigned long) &ax8817x_info, |