summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-31 09:35:53 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-31 09:35:53 -0700
commite55a3366984cda7d179e194a772f5ae4fe551b80 (patch)
treede73ef7cf2316af7b01a75d6f0df9975930cbed2 /Documentation
parent5f77fc456cd6d3f6961459d2d279f2698c545184 (diff)
downloadop-kernel-dev-e55a3366984cda7d179e194a772f5ae4fe551b80.zip
op-kernel-dev-e55a3366984cda7d179e194a772f5ae4fe551b80.tar.gz
Revert "Input: i8042 - disable active multiplexing by default"
This reverts commit 68da166491655bc54051bf04c78ce648e2e33508. It turns out that the assertion about scope of regressions due to always keeping keyboard controller in legacy mode was proven wrong. There are laptops, such as Clevo W650SH, that only have internal touchpad (no external PS/2 ports), that require active multiplexing mode to switch the touchpad (Elantech) into native mode instead of basic PS/2 emulation. Reported-by: Roel Aaij <roel.aaij@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6b10543..10d51c2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1237,7 +1237,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
i8042.noloop [HW] Disable the AUX Loopback command while probing
for the AUX port
i8042.nomux [HW] Don't check presence of an active multiplexing
- controller. Default: true.
+ controller
i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
controllers
i8042.notimeout [HW] Ignore timeout condition signalled by controller
OpenPOWER on IntegriCloud