diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-22 07:17:27 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-22 07:17:27 +0200 |
| commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
| tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /drivers/input/mouse/synaptics.c | |
| parent | Merge branch 'elan-i2c' into next (diff) | |
| parent | Input: elan_i2c - add more hardware ID for Lenovo laptops (diff) | |
| download | linux-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.xz linux-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.zip | |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -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 758dae8d6500..4b81b2d0fe06 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -179,6 +179,7 @@ static const char * const smbus_pnp_ids[] = { "LEN0093", /* T480 */ "LEN0096", /* X280 */ "LEN0097", /* X280 -> ALPS trackpoint */ + "LEN0099", /* X1 Extreme 1st */ "LEN009b", /* T580 */ "LEN200f", /* T450s */ "LEN2044", /* L470 */ |