diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-02-08 19:03:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-08 19:03:33 -0800 |
| commit | cf1de4e04bec91413036ee2597fc754ce5fa8485 (patch) | |
| tree | 2622dc5b30b734eac1c8219ed37d6a9ec140e68a /drivers/media | |
| parent | 71de2d96a7c0a4ab9250c950ae7e429c49239d34 (diff) | |
| parent | 2fd547e8d1f09628007fc2bca04ccff416bb9d76 (diff) | |
Merge "Merge android-4.4.115 (aa856bd) into msm-4.4"
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/usbtv/usbtv-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c index 29428bef272c..3bbc77aa6a33 100644 --- a/drivers/media/usb/usbtv/usbtv-core.c +++ b/drivers/media/usb/usbtv/usbtv-core.c @@ -127,6 +127,7 @@ static void usbtv_disconnect(struct usb_interface *intf) static struct usb_device_id usbtv_id_table[] = { { USB_DEVICE(0x1b71, 0x3002) }, + { USB_DEVICE(0x1f71, 0x3301) }, {} }; MODULE_DEVICE_TABLE(usb, usbtv_id_table); |