diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 11:41:28 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 11:41:28 -0400 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /drivers/net/usb/cdc_ether.c | |
| parent | 25db711df3258d125dc1209800317e5c0ef3c870 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 41a61efc331e..90a30026a931 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -573,6 +573,13 @@ static const struct usb_device_id products [] = { | |||
| 573 | .driver_info = 0, | 573 | .driver_info = 0, |
| 574 | }, | 574 | }, |
| 575 | 575 | ||
| 576 | /* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */ | ||
| 577 | { | ||
| 578 | USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM, | ||
| 579 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 580 | .driver_info = 0, | ||
| 581 | }, | ||
| 582 | |||
| 576 | /* | 583 | /* |
| 577 | * WHITELIST!!! | 584 | * WHITELIST!!! |
| 578 | * | 585 | * |