diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
| commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
| tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /drivers/net/usb/cdc_ether.c | |
| parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
| parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) | |
| download | op-kernel-dev-e7051e9dab77ddeaddbe12364939ae239d92ca73.zip op-kernel-dev-e7051e9dab77ddeaddbe12364939ae239d92ca73.tar.gz | |
Merge branch 'samsung/exynos5' into next/soc2
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 41a61ef..90a3002 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 [] = { .driver_info = 0, }, +/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */ +{ + USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM, + USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + /* * WHITELIST!!! * |
