diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-02-03 14:46:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-02-03 14:46:16 +0100 |
| commit | 88128caee0fcca2e9f30da04908fe593e0f3472e (patch) | |
| tree | ffb2b7ca21573f5d8022428310e8c2de3bdf86b7 /drivers/hid/hid-core.c | |
| parent | 87bf6fdcdc122b9808886ddd1e86e2ae3b92e4be (diff) | |
| parent | f3287a995ac3520b1afcf03932b9c405f502657c (diff) | |
Merge branch 'for-4.10/upstream-fixes' into for-next
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 390dfe0c3f69..538ff697a4cf 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1930,6 +1930,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) }, #endif + { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MELFAS_MT) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) }, |