diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /drivers/net/usb/asix.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
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 37ecf845edfe..e12cdb4543b4 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
| @@ -1444,6 +1444,10 @@ static const struct usb_device_id products [] = { | |||
| 1444 | // Apple USB Ethernet Adapter | 1444 | // Apple USB Ethernet Adapter |
| 1445 | USB_DEVICE(0x05ac, 0x1402), | 1445 | USB_DEVICE(0x05ac, 0x1402), |
| 1446 | .driver_info = (unsigned long) &ax88772_info, | 1446 | .driver_info = (unsigned long) &ax88772_info, |
| 1447 | }, { | ||
| 1448 | // Cables-to-Go USB Ethernet Adapter | ||
| 1449 | USB_DEVICE(0x0b95, 0x772a), | ||
| 1450 | .driver_info = (unsigned long) &ax88772_info, | ||
| 1447 | }, | 1451 | }, |
| 1448 | { }, // END | 1452 | { }, // END |
| 1449 | }; | 1453 | }; |