diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 20:56:45 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 20:56:45 +0100 |
| commit | bbdb5c22e12507e7f1637091bc24fe4d33e128e5 (patch) | |
| tree | b66d1f87c6659d6875b5b0bd6b71cbfe3bbe2285 /drivers/input/mouse | |
| parent | HID: hid-gfrm: avoid warning for input_configured API change (diff) | |
| parent | Input: parkbd - drop bogus __init from parkbd_allocate_serio() (diff) | |
| download | linux-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.tar.xz linux-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[] = { 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 { } }; |