From: Jiri Kosina Date: Wed, 3 Jun 2020 20:23:52 +0000 (+0200) Subject: Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5... X-Git-Tag: v5.10.7~2454^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16ba7e312045cd5d32fba0156312b4303f200787;p=platform%2Fkernel%2Flinux-rpi.git Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus --- 16ba7e312045cd5d32fba0156312b4303f200787 diff --cc drivers/hid/hid-ids.h index f03f1cc,1c71a1a,09eb3d8b7,b18b131,1c71a1a,b18b131,b18b131,5942e75..874fc37 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@@@@@@@ -76,12 -76,12 -76,12 -76,12 -76,12 -76,12 -76,12 -76,9 +76,9 @@@@@@@@@ #define USB_VENDOR_ID_ALPS_JP 0x044E #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B ------- #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F ------- #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 #define HID_DEVICE_ID_ALPS_U1 0x1215 + ++ #define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY 0x121E #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C ------- #define HID_DEVICE_ID_ALPS_1222 0x1222 - -- #define USB_VENDOR_ID_AMI 0x046b #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10