diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-04-07 06:56:50 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-04-07 06:56:50 +0300 |
| commit | cd510679f4b588b7726fc8b25e5a0afd6f889b14 (patch) | |
| tree | 5f4dcae0633b0b7dce8684cfb6e2ee527d6b78f1 /drivers/input/serio | |
| parent | 4134252ab7e2c339a54302b88496cb5a89cdbaec (diff) | |
| parent | 3a8579629665bd6c0b37afcb2291080e959b885d (diff) | |
| download | linux-cd510679f4b588b7726fc8b25e5a0afd6f889b14.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 5.7 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index dc974c288e88..08e919dbeb5d 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -530,6 +530,17 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), }, }, + { + /* + * Acer Aspire 5738z + * Touchpad stops working in mux mode when dis- + re-enabled + * with the touchpad enable/disable toggle hotkey + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), + }, + }, { } }; |