diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-05-17 21:10:28 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-05-17 21:10:28 -0700 |
| commit | 2969869bfac3cb8c549f6cadea6b97bb1d9ec86f (patch) | |
| tree | 50a585182a13e7ebe587ea1cf34f06272c218b02 /drivers/input/serio | |
| parent | Input: add support for Azoteq IQS269A (diff) | |
| parent | Input: applespi - replace zero-length array with flexible-array (diff) | |
| download | linux-dev-2969869bfac3cb8c549f6cadea6b97bb1d9ec86f.tar.xz linux-dev-2969869bfac3cb8c549f6cadea6b97bb1d9ec86f.zip | |
Merge branch 'for-linus' into next
Merge for-linus branch to sync Elan touchscreen driver code.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index d0c39426ca2c..7b08ff8ddf35 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -662,6 +662,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"), }, }, + { + /* Lenovo ThinkPad Twist S230u */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), + }, + }, { } }; |