diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-02-25 00:02:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-25 00:02:05 -0800 |
| commit | f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (patch) | |
| tree | 9edf1e86fbb91815f31d7728820d098041f03bb9 /drivers/net/usb | |
| parent | qlge: Use one path to (re)fill rx buffers. (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f.tar.xz linux-dev-f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f.zip | |
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.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 }; |