diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /drivers/net/usb | |
| parent | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 3486e8ca039a..c8cdb7f30adc 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -582,6 +582,11 @@ static const struct usb_device_id products [] = { | |||
| 582 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 582 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |
| 583 | .driver_info = (unsigned long) &mbm_info, | 583 | .driver_info = (unsigned long) &mbm_info, |
| 584 | }, { | 584 | }, { |
| 585 | /* Ericsson C3607w ver 2 */ | ||
| 586 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190b, USB_CLASS_COMM, | ||
| 587 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 588 | .driver_info = (unsigned long) &mbm_info, | ||
| 589 | }, { | ||
| 585 | /* Toshiba F3507g */ | 590 | /* Toshiba F3507g */ |
| 586 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM, | 591 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM, |
| 587 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 592 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |