summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-10 23:03:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-10 23:03:33 -0700
commit81c2642f71b19b2c80a857603ec05aaf5111e1ad (patch)
tree197b2646124abf2fd68985bf7d052bd05949df1d /drivers/input
parent3d82d66409abb91539bcb9d1f343fcb9d583f2b4 (diff)
parent78cf4322e2ed0dcb54e7f9872a8d15340ebfa8bb (diff)
Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'"
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 25eab453f2b2..e7b96f1ac2c5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -685,6 +685,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "20046"),
},
},
+ {
+ /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
+ },
+ },
{ }
};