diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
commit | d4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch) | |
tree | 3d65887b06c575a94feed1fd91216e32a62b31d8 /drivers/net/usb/asix.c | |
parent | 3a011a171906a3a51a43bb860fb7c66a64cab140 (diff) | |
parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/usb/asix.c')
-rw-r--r-- | drivers/net/usb/asix.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index e009481c606c..396f821b5ff0 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -1451,6 +1451,14 @@ static const struct usb_device_id products [] = { // Cables-to-Go USB Ethernet Adapter USB_DEVICE(0x0b95, 0x772a), .driver_info = (unsigned long) &ax88772_info, +}, { + // ABOCOM for pci + USB_DEVICE(0x14ea, 0xab11), + .driver_info = (unsigned long) &ax88178_info, +}, { + // ASIX 88772a + USB_DEVICE(0x0db0, 0xa877), + .driver_info = (unsigned long) &ax88772_info, }, { }, // END }; |