diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/usb/net/usbnet.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 [] = { | |||
| 4071 | USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader | 4071 | USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader |
| 4072 | .driver_info = (unsigned long) &blob_info, | 4072 | .driver_info = (unsigned long) &blob_info, |
| 4073 | }, { | 4073 | }, { |
| 4074 | USB_DEVICE (0x22b8, 0x600c), // USBNET Motorola E680 | ||
| 4075 | .driver_info = (unsigned long) &linuxdev_info, | ||
| 4076 | }, { | ||
| 4074 | // Linux Ethernet/RNDIS gadget on pxa210/25x/26x | 4077 | // Linux Ethernet/RNDIS gadget on pxa210/25x/26x |
| 4075 | // e.g. Gumstix, current OpenZaurus, ... | 4078 | // e.g. Gumstix, current OpenZaurus, ... |
| 4076 | USB_DEVICE_VER (0x0525, 0xa4a2, 0x0203, 0x0203), | 4079 | USB_DEVICE_VER (0x0525, 0xa4a2, 0x0203, 0x0203), |