diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 14:59:37 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 14:59:37 +0200 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /drivers/usb/net/usbnet.c | |
| parent | [AUDIT] Log correct syscall args for i386 processes on x86_64 (diff) | |
| parent | [PATCH] drivers/base/bus.c: fix iteration in driver_detach() (diff) | |
| download | linux-bfd4bda097f8758d28e632ff2035e25577f6b060.tar.xz linux-bfd4bda097f8758d28e632ff2035e25577f6b060.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/net/usbnet.c')
| -rw-r--r-- | drivers/usb/net/usbnet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index a45ea7c97356..f6bc6b3b333c 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c @@ -4071,6 +4071,9 @@ static const struct usb_device_id products [] = { USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader .driver_info = (unsigned long) &blob_info, }, { + USB_DEVICE (0x22b8, 0x600c), // USBNET Motorola E680 + .driver_info = (unsigned long) &linuxdev_info, +}, { // Linux Ethernet/RNDIS gadget on pxa210/25x/26x // e.g. Gumstix, current OpenZaurus, ... USB_DEVICE_VER (0x0525, 0xa4a2, 0x0203, 0x0203), |