projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus
[cascardo/linux.git]
/
drivers
/
input
/
mouse
/
synaptics.c
diff --git
a/drivers/input/mouse/synaptics.c
b/drivers/input/mouse/synaptics.c
index
bee0387
..
7e705ee
100644
(file)
--- a/
drivers/input/mouse/synaptics.c
+++ b/
drivers/input/mouse/synaptics.c
@@
-138,8
+138,9
@@
static const struct min_max_quirk min_max_pnpid_table[] = {
1232, 5710, 1156, 4696
},
{
1232, 5710, 1156, 4696
},
{
- (const char * const []){"LEN0034", "LEN0036", "LEN0039",
- "LEN2002", "LEN2004", NULL},
+ (const char * const []){"LEN0034", "LEN0036", "LEN0037",
+ "LEN0039", "LEN2002", "LEN2004",
+ NULL},
1024, 5112, 2024, 4832
},
{
1024, 5112, 2024, 4832
},
{
@@
-168,7
+169,7
@@
static const char * const topbuttonpad_pnp_ids[] = {
"LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */
"LEN0035", /* X240 */
"LEN0036", /* T440 */
"LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */
"LEN0035", /* X240 */
"LEN0036", /* T440 */
- "LEN0037",
+ "LEN0037",
/* X1 Carbon 2nd */
"LEN0038",
"LEN0039", /* T440s */
"LEN0041",
"LEN0038",
"LEN0039", /* T440s */
"LEN0041",