diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-22 16:57:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-22 16:57:26 -0800 |
| commit | 2027cabe6afea5d471401ec704b65ce18f958fdc (patch) | |
| tree | f55886f3ea756f13f65cabf629d2206c45f7fa24 | |
| parent | 34c36f4564b8a3339db3ce832a5aaf1871185685 (diff) | |
| parent | 8791663435e7fea896d8ca0f56fd64976d2089ff (diff) | |
| download | linux-2027cabe6afea5d471401ec704b65ce18f958fdc.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"Just a single revert as RMI mode should not have been enabled for this
model [yet?]"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Revert "Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation"
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 704558d449a2..56fae3472114 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -177,7 +177,6 @@ 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 */ |