Skip to content

L
linux
Commit 9eca9b8c authored by Vojtech Pavlik's avatar Vojtech Pavlik
Browse files
Options

Merge suse.cz:/data/bk/linus into suse.cz:/data/bk/input

parents bda1ea3d 5d8f1ff9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/input/serio/i8042.c
View file @ 9eca9b8c
...@@ -532,8 +532,8 @@ static int __init i8042_check_mux(struct i8042_values *values) ...@@ -532,8 +532,8 @@ static int __init i8042_check_mux(struct i8042_values *values)
return -1; return -1;
/* Workaround for broken chips which seem to support MUX, but in reality don't. */ /* Workaround for broken chips which seem to support MUX, but in reality don't. */
/* They all report version 12.10 */ /* They all report version 10.12 */
if (mux_version == 0xCA) if (mux_version == 0xAC)
return -1; return -1;
printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n", printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7