aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-04-27 18:06:02 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-04-27 18:06:02 -0700
commitf4dec2d6160976b14e54be9c3950ce0f52385741 (patch)
treee06644099ba10e6bc0412a2bb237fb74fbfb64f8 /drivers/input
parentInput: dlink-dir685-touchkeys - fix a typo in driver name (diff)
downloadlinux-dev-f4dec2d6160976b14e54be9c3950ce0f52385741.tar.xz
linux-dev-f4dec2d6160976b14e54be9c3950ce0f52385741.zip
Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin Locke: "... nomux only appeared to fix the issue because the controller continued working after warm reboots. After more thorough testing from both warm and cold start, I now believe the entry should be added to i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1 alone is sufficient to avoid the issue from both states while i8042.nomux is not."
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 5bbc9152731d..08e919dbeb5d 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -541,13 +541,6 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
},
},
- {
- /* Lenovo ThinkPad Twist S230u */
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
- },
- },
{ }
};