diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-28 03:48:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-28 03:48:01 +0200 |
| commit | c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19 (patch) | |
| tree | 6c7ec7cea037f66b9beea02636b02aba7c0e9164 /drivers/input/mouse/elantech.c | |
| parent | Input: iqs5xx - remove redundant dev_set_drvdata call (diff) | |
| parent | Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD (diff) | |
| download | linux-c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19.tar.xz linux-c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19.zip | |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.
Diffstat (limited to 'drivers/input/mouse/elantech.c')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index a7f8b1614559..530142b5a115 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1189,6 +1189,8 @@ static const char * const middle_button_pnp_ids[] = { "LEN2132", /* ThinkPad P52 */ "LEN2133", /* ThinkPad P72 w/ NFC */ "LEN2134", /* ThinkPad P72 */ + "LEN0407", + "LEN0408", NULL }; |