diff options
author | Dmitry Torokhov | 2015-11-13 13:56:45 -0600 |
---|---|---|
committer | Dmitry Torokhov | 2015-11-13 13:56:45 -0600 |
commit | bbdb5c22e12507e7f1637091bc24fe4d33e128e5 (patch) | |
tree | b66d1f87c6659d6875b5b0bd6b71cbfe3bbe2285 /drivers/input/mouse | |
parent | e60e063c14b13d0f66ffc708b8aa5d1a8208606e (diff) | |
parent | 5e0baca8b3247f459af50947eaafc68bb8168b33 (diff) | |
download | kernel-omap-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.tar.gz kernel-omap-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.tar.xz kernel-omap-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.zip |
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.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 2955f1d0ca6c..537ebb0e193a 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[] = { | |||
1520 | DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"), | 1520 | DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"), |
1521 | }, | 1521 | }, |
1522 | }, | 1522 | }, |
1523 | { | ||
1524 | /* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */ | ||
1525 | .matches = { | ||
1526 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), | ||
1527 | DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"), | ||
1528 | }, | ||
1529 | }, | ||
1523 | #endif | 1530 | #endif |
1524 | { } | 1531 | { } |
1525 | }; | 1532 | }; |