diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-10 13:12:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-10 13:12:29 +0200 |
| commit | 7c224a03a79021ab12ce057964df9e679af5386d (patch) | |
| tree | 809dbf3bcb5978e7b1845eb4c46179f1c9405f0c /drivers/net/usb/kaweth.c | |
| parent | oprofile/x86: remove duplicate IBS capability check (diff) | |
| parent | Linux 2.6.34-rc7 (diff) | |
| download | linux-7c224a03a79021ab12ce057964df9e679af5386d.tar.xz linux-7c224a03a79021ab12ce057964df9e679af5386d.zip | |
Merge commit 'v2.6.34-rc7' into oprofile
Merge reason: Update to Linus's latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/usb/kaweth.c')
| -rw-r--r-- | drivers/net/usb/kaweth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 52671ea043a7..c4c334d9770f 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -145,6 +145,7 @@ static struct usb_device_id usb_klsi_table[] = { { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */ { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */ { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */ + { USB_DEVICE(0x07c9, 0xb010) }, /* Allied Telesyn AT-USB10 USB Ethernet Adapter */ { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */ { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */ { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */ |