diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-15 18:52:21 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-15 18:52:21 +0200 |
| commit | bbc8608755da42e7494c00dce24a636007972def (patch) | |
| tree | 7db003ee57a435042dedfa6664aef31c24922c04 /drivers/input/serio | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: i8042 - add Gigabyte P57 to the keyboard reset table (diff) | |
| download | linux-bbc8608755da42e7494c00dce24a636007972def.tar.xz linux-bbc8608755da42e7494c00dce24a636007972def.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.14 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index ae81e57e13b9..6cbbdc6e9687 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -840,6 +840,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { }, }, { + /* Gigabyte P57 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "P57"), + }, + }, + { /* Schenker XMG C504 - Elantech touchpad */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "XMG"), |