summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-11 00:40:22 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-11 00:40:22 -0700
commite5a68ffaa375a3503ac31de90a8a2c09d5526740 (patch)
tree338be0f46e39dddfdbe0c5d81a40e4d1815d600e /drivers/input
parent0f0e37eeace714d4b3bb6907323d46ba2c6d73f1 (diff)
parent9aabfa05967291ecbc7a0bfcca27c9669dd1853e (diff)
Merge "Merge android-4.4@8c91412 (v4.4.75) into 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 e7b96f1ac2c5..5be14ad29d46 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -788,6 +788,13 @@ static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"),
},
},
+ {
+ /* Fujitsu UH554 laptop */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"),
+ },
+ },
{ }
};