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

5d8f1ff9 · Vojtech Pavlik · ed407526 · b249c8ca · 5d8f1ff9
Commit 5d8f1ff9 authored Mar 22, 2004 by Vojtech Pavlik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/input/serio/i8042.c drivers/input/serio/i8042.c +2 -2

No files found.
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -532,8 +532,8 @@ static int __init i8042_check_mux(struct i8042_values *values)
 		return -1;
 	
 	/* Workaround for broken chips which seem to support MUX, but in reality don't. */
-	/* They all report version 12.10 */
-	if (mux_version == 0xCA)
+	/* They all report version 10.12 */
+	if (mux_version == 0xAC)
 		return -1;

 	printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n",