summaryrefslogtreecommitdiff
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-11-13 19:56:45 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-11-13 19:56:45 (GMT)
commitbbdb5c22e12507e7f1637091bc24fe4d33e128e5 (patch)
treeb66d1f87c6659d6875b5b0bd6b71cbfe3bbe2285 /drivers/input/mouse
parente60e063c14b13d0f66ffc708b8aa5d1a8208606e (diff)
parent5e0baca8b3247f459af50947eaafc68bb8168b33 (diff)
downloadlinux-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.tar.xz
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/elantech.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 2955f1d..537ebb0 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1520,6 +1520,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),
},
},
+ {
+ /* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"),
+ },
+ },
#endif
{ }
};