diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-06 01:45:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-06 01:45:06 +0100 |
| commit | 65c64d1845fbc6420f8836e8731ea6c3012e8e7d (patch) | |
| tree | e7652f8508b9f1da90f234b20e17212d08d5bc0b /drivers/input/mouse | |
| parent | Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | Input: xen-kbdfront - do not advertise multi-touch pressure support (diff) | |
| download | linux-65c64d1845fbc6420f8836e8731ea6c3012e8e7d.tar.xz linux-65c64d1845fbc6420f8836e8731ea6c3012e8e7d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a few driver fixups, nothing exciting"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xen-kbdfront - do not advertise multi-touch pressure support
Input: hideep - fix compile error due to missing include file
Input: elants_i2c - do not clobber interrupt trigger on x86
Input: joystick/analog - riscv has get_cycles()
Input: elantech - add new icbody type 15
Input: ims-pcu - fix typo in the error message
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index b84cd978fce2..a4aaa748e987 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1613,7 +1613,7 @@ static int elantech_set_properties(struct elantech_data *etd) case 5: etd->hw_version = 3; break; - case 6 ... 14: + case 6 ... 15: etd->hw_version = 4; break; default: |