aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-25 00:02:05 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-25 00:02:05 -0800
commitf11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (patch)
tree9edf1e86fbb91815f31d7728820d098041f03bb9 /drivers/net/usb
parent4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7 (diff)
parent0c9a3aaaf30e1d1994de58c554ef97a719e20892 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/orinoco/orinoco.c
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index e009481c606..396f821b5ff 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
};