diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-13 01:38:35 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-13 01:38:35 +0200 |
commit | 5aff29efbec020f0997e5cdbefce0ff383518986 (patch) | |
tree | 8b7df95c23b3cd2cfa17873ff0fa999dd5ae35bd /drivers/input/mouse/synaptics.c | |
parent | Input: i8042 - increment wakeup_count for the respective port (diff) | |
parent | Input: xen-kbdfront - allow better run-time configuration (diff) | |
download | linux-5aff29efbec020f0997e5cdbefce0ff383518986.tar.xz linux-5aff29efbec020f0997e5cdbefce0ff383518986.zip |
Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next
Bring in xen-kbdfront changes.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r-- | drivers/input/mouse/synaptics.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index e3e0ef585eb6..55d33500d55e 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -172,6 +172,12 @@ static const char * const smbus_pnp_ids[] = { "LEN0048", /* X1 Carbon 3 */ "LEN0046", /* X250 */ "LEN004a", /* W541 */ + "LEN0071", /* T480 */ + "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ + "LEN0073", /* X1 Carbon G5 (Elantech) */ + "LEN0092", /* X1 Carbon 6 */ + "LEN0096", /* X280 */ + "LEN0097", /* X280 -> ALPS trackpoint */ "LEN200f", /* T450s */ NULL }; |