summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@linaro.org>2017-09-27 17:33:18 -0700
committerSumit Semwal <sumit.semwal@linaro.org>2017-09-27 17:33:18 -0700
commitdbcdcffd177b3b362d68891b0399d4e8bdf94250 (patch)
tree3d6ba2ae4820670284365f1fba21a7460cc4cb46 /drivers/input
parent357fdc8959dc79696d9c43c2a3f7a93e3a503d87 (diff)
parent10def3a6779924f7bb130200b8b940caf2914111 (diff)
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.89-hikey
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 5be14ad29d46..dbf09836ff30 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -905,6 +905,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"),