diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-09 01:06:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-09 01:06:45 +0400 |
| commit | d86561b4c7473ad43e365afdba2142b75907c9d2 (patch) | |
| tree | b6ebff1f97b45bd82b8b90a0a01c5037ed25203e /drivers/input/mouse/elantech.h | |
| parent | c6c96d7bba416c33204a1abc96abdf78668a0936 (diff) | |
| parent | 36189cc3cd57ab0f1cd75241f93fe01de928ac06 (diff) | |
| download | linux-d86561b4c7473ad43e365afdba2142b75907c9d2.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Just a few fixups to various drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - fix touchpad initialization on Gigabyte U2442
Input: tca8418 - fix loading this driver as a module from a device tree
Input: bma150 - extend chip detection for bma180
Input: atkbd - fix keyboard not working on some LG laptops
Input: synaptics - add min/max quirk for ThinkPad Edge E431
Diffstat (limited to 'drivers/input/mouse/elantech.h')
| -rw-r--r-- | drivers/input/mouse/elantech.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index 036a04abaef7..9e0e2a1f340d 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h @@ -130,6 +130,7 @@ struct elantech_data { bool jumpy_cursor; bool reports_pressure; bool crc_enabled; + bool set_hw_resolution; unsigned char hw_version; unsigned int fw_version; unsigned int single_finger_reports; |