diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:14:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:14:23 -0700 |
| commit | a9cf7cd0d7474026d05296c666a0b7f83d798c03 (patch) | |
| tree | afaf5041d3efabb5f5b0032d5b0e67ffacd84c28 /drivers/usb/net/dm9601.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | USB: new Novatel device ids for option driver (diff) | |
| download | linux-dev-a9cf7cd0d7474026d05296c666a0b7f83d798c03.tar.xz linux-dev-a9cf7cd0d7474026d05296c666a0b7f83d798c03.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: new Novatel device ids for option driver
USB: berry_charge: correct dbg string for second magic command
usblp: quirk flag and device entry for Seiko Epson M129C printer
airprime: USB ID for Novatel EV620 mini PCI-E card
USB: necessary update for mos7720 driver
USB: RAZR v3i unusual_devs
USB: two more device ids for dm9601 usbnet driver
USB: fix usb-serial regression
Diffstat (limited to 'drivers/usb/net/dm9601.c')
| -rw-r--r-- | drivers/usb/net/dm9601.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/net/dm9601.c b/drivers/usb/net/dm9601.c index c0bc52be5e10..5130cc7eb314 100644 --- a/drivers/usb/net/dm9601.c +++ b/drivers/usb/net/dm9601.c @@ -578,6 +578,14 @@ static const struct usb_device_id products[] = { USB_DEVICE(0x0a46, 0x9601), /* Davicom USB-100 */ .driver_info = (unsigned long)&dm9601_info, }, + { + USB_DEVICE(0x0a46, 0x6688), /* ZT6688 USB NIC */ + .driver_info = (unsigned long)&dm9601_info, + }, + { + USB_DEVICE(0x0a46, 0x0268), /* ShanTou ST268 USB NIC */ + .driver_info = (unsigned long)&dm9601_info, + }, {}, // END }; |