Merge branch 'for-5.9/lenovo' into for-linus

- ThinkPad 10 Ultrabook Keyboard support, from Hans de Goede

Merge branch 'for-5.9/lenovo' into for-linus
- ThinkPad 10 Ultrabook Keyboard support, from Hans de Goede
ccac9cec · Jiri Kosina · cd6cad55 · 49429428 · ccac9cec · ccac9cec
展开全部隐藏空白更改
内联并排

Showing with 282 addition and 79 deletion

drivers/hid/hid-ids.h drivers/hid/hid-ids.h +1 -0

drivers/hid/hid-lenovo.c drivers/hid/hid-lenovo.c +281 -79

未找到文件。
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -724,6 +724,7 @@
 #define USB_DEVICE_ID_LENOVO_CUSBKBD	0x6047
 #define USB_DEVICE_ID_LENOVO_CBTKBD	0x6048
 #define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049
+#define USB_DEVICE_ID_LENOVO_TP10UBKBD	0x6062
 #define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067
 #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d

--- a/drivers/hid/hid-lenovo.c
+++ b/drivers/hid/hid-lenovo.c