diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/net/usb/cdc_ether.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 4a6aff579403..21e1ba160008 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -544,20 +544,60 @@ static const struct usb_device_id products [] = { | |||
| 544 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 544 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |
| 545 | .driver_info = (unsigned long) &cdc_info, | 545 | .driver_info = (unsigned long) &cdc_info, |
| 546 | }, { | 546 | }, { |
| 547 | /* Ericsson F3307 */ | 547 | /* Ericsson F3607gw ver 2 */ |
| 548 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM, | ||
| 549 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 550 | .driver_info = (unsigned long) &cdc_info, | ||
| 551 | }, { | ||
| 552 | /* Ericsson F3607gw ver 3 */ | ||
| 548 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM, | 553 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM, |
| 549 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 554 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |
| 550 | .driver_info = (unsigned long) &cdc_info, | 555 | .driver_info = (unsigned long) &cdc_info, |
| 551 | }, { | 556 | }, { |
| 557 | /* Ericsson F3307 */ | ||
| 558 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM, | ||
| 559 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 560 | .driver_info = (unsigned long) &cdc_info, | ||
| 561 | }, { | ||
| 562 | /* Ericsson F3307 ver 2 */ | ||
| 563 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM, | ||
| 564 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 565 | .driver_info = (unsigned long) &cdc_info, | ||
| 566 | }, { | ||
| 567 | /* Ericsson C3607w */ | ||
| 568 | USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM, | ||
| 569 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 570 | .driver_info = (unsigned long) &cdc_info, | ||
| 571 | }, { | ||
| 552 | /* Toshiba F3507g */ | 572 | /* Toshiba F3507g */ |
| 553 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM, | 573 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM, |
| 554 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 574 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |
| 555 | .driver_info = (unsigned long) &cdc_info, | 575 | .driver_info = (unsigned long) &cdc_info, |
| 556 | }, { | 576 | }, { |
| 577 | /* Toshiba F3607gw */ | ||
| 578 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM, | ||
| 579 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 580 | .driver_info = (unsigned long) &cdc_info, | ||
| 581 | }, { | ||
| 582 | /* Toshiba F3607gw ver 2 */ | ||
| 583 | USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM, | ||
| 584 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 585 | .driver_info = (unsigned long) &cdc_info, | ||
| 586 | }, { | ||
| 557 | /* Dell F3507g */ | 587 | /* Dell F3507g */ |
| 558 | USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM, | 588 | USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM, |
| 559 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | 589 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |
| 560 | .driver_info = (unsigned long) &cdc_info, | 590 | .driver_info = (unsigned long) &cdc_info, |
| 591 | }, { | ||
| 592 | /* Dell F3607gw */ | ||
| 593 | USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM, | ||
| 594 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 595 | .driver_info = (unsigned long) &cdc_info, | ||
| 596 | }, { | ||
| 597 | /* Dell F3607gw ver 2 */ | ||
| 598 | USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM, | ||
| 599 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 600 | .driver_info = (unsigned long) &cdc_info, | ||
| 561 | }, | 601 | }, |
| 562 | { }, // END | 602 | { }, // END |
| 563 | }; | 603 | }; |
