diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-15 18:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-15 18:37:20 -0800 |
| commit | 6c9594bdd47412ebf74616593b9dcad67c4e9e00 (patch) | |
| tree | 4822920ebb9e6b37dbf3f9e0ae556bc899ac55bf /drivers/input/mouse | |
| parent | b226c9e1f4cb23bf6fa6c74af361e5136cb5804c (diff) | |
| parent | 768ea88bcb235ac3a92754bf82afcd3f12200bcc (diff) | |
| download | blackbird-op-linux-6c9594bdd47412ebf74616593b9dcad67c4e9e00.tar.gz blackbird-op-linux-6c9594bdd47412ebf74616593b9dcad67c4e9e00.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input fixes from Dmitry Torokhov:
"A couple of fixes in driver teardown paths and another ID for
Synaptics RMI mode"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation
Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
Input: ff-memless - kill timer in destroy()
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 56fae3472114..704558d449a2 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -177,6 +177,7 @@ static const char * const smbus_pnp_ids[] = { "LEN0096", /* X280 */ "LEN0097", /* X280 -> ALPS trackpoint */ "LEN009b", /* T580 */ + "LEN0402", /* X1 Extreme 2nd Generation */ "LEN200f", /* T450s */ "LEN2054", /* E480 */ "LEN2055", /* E580 */ |
