aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/asix.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-11-19 00:10:32 -0500
committerPaul Mackerras <paulus@samba.org>2008-11-19 00:10:32 -0500
commitcea555d384b85271035814c5adad23e6c7fc5d2a (patch)
tree1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/net/usb/asix.c
parent78608dd32ce46789e970d6c3c423cd668c138d6c (diff)
parent7f0f598a0069d1ab072375965a4b69137233169c (diff)
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/net/usb/asix.c')
-rw-r--r--drivers/net/usb/asix.c4
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};