bk://kernel.bkbits.net/vojtech/input
vojtech@suse.cz|ChangeSet|20040322150601|59039 vojtech

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/04/01 15:09:02-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# init/main.c
#   2004/04/01 15:08:59-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/24 02:40:26-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# Documentation/kernel-parameters.txt
#   2004/03/24 02:40:23-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/23 03:06:16-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# drivers/input/serio/i8042.c
#   2004/03/23 03:06:13-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/22 13:30:28-08:00 akpm@bix.(none) 
#   Merge bk://kernel.bkbits.net/vojtech/input
#   into bix.(none):/usr/src/bk-input
# 
# drivers/input/serio/i8042.c
#   2004/03/22 13:30:25-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/19 14:56:45+01:00 vojtech@suse.cz 
#   input: Chips passing MUX detection incorrectly due to USB Legacy support
#          report MUX version 10.12, not 12.10. Fixed.
# 
# drivers/input/serio/i8042.c
#   2004/03/19 14:56:40+01:00 vojtech@suse.cz +2 -2
#   input: Chips passing MUX detection incorrectly due to USB Legacy support
#          report MUX version 10.12, not 12.10. Fixed.
# 
# ChangeSet
#   2004/03/16 12:44:52-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# init/main.c
#   2004/03/16 12:44:36-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/char/Kconfig
#   2004/03/16 12:44:36-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# Documentation/kernel-parameters.txt
#   2004/03/16 12:44:36-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/14 10:50:14-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# init/main.c
#   2004/03/14 10:50:00-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# Documentation/kernel-parameters.txt
#   2004/03/14 10:50:00-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/12 10:44:04-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-input
# 
# drivers/char/Kconfig
#   2004/03/12 10:43:50-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/12 00:49:27-08:00 akpm@bix.(none) 
#   Merge bk://kernel.bkbits.net/vojtech/input
#   into bix.(none):/usr/src/bk-input
# 
# init/main.c
#   2004/03/12 00:49:07-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/10 10:36:24-08:00 akpm@mnm.(none) 
#   Merge mnm.(none):/usr/src/bk25 into mnm.(none):/usr/src/bk-input
# 
# init/main.c
#   2004/03/10 10:36:17-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/08 22:31:40-08:00 akpm@mnm.(none) 
#   Merge bk://kernel.bkbits.net/vojtech/input
#   into mnm.(none):/usr/src/bk-input
# 
# Documentation/kernel-parameters.txt
#   2004/03/08 22:31:33-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/06 12:55:28-08:00 akpm@mnm.(none) 
#   Merge mnm.(none):/usr/src/bk25 into mnm.(none):/usr/src/bk-input
# 
# Documentation/kernel-parameters.txt
#   2004/03/06 12:55:22-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/03 14:17:29-08:00 akpm@mnm.(none) 
#   Merge bk://kernel.bkbits.net/vojtech/input
#   into mnm.(none):/usr/src/bk-input
# 
# drivers/input/serio/i8042.c
#   2004/03/03 14:17:23-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/03 02:22:06-08:00 akpm@mnm.(none) 
#   Merge bk://kernel.bkbits.net/vojtech/input
#   into mnm.(none):/usr/src/bk-input
# 
# drivers/input/serio/i8042.c
#   2004/03/03 02:22:00-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/02 22:13:49-08:00 akpm@mnm.(none) 
#   Merge mnm.(none):/usr/src/bk25 into mnm.(none):/usr/src/bk-input
# 
# drivers/input/serio/i8042.c
#   2004/03/02 22:13:42-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c	Fri Apr  9 13:22:45 2004
+++ b/drivers/input/serio/i8042.c	Fri Apr  9 13:22:45 2004
@@ -532,8 +532,8 @@
 		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",