diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-21 22:17:27 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-21 22:17:27 -0700 |
commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /drivers/input/serio | |
parent | 9b031c86506cef9acae45e61339fcf9deaabb793 (diff) | |
parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff) | |
download | linux-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.bz2 |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
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 7b08ff8ddf35..7d7f73702726 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -426,6 +426,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { }, }, { + /* Lenovo XiaoXin Air 12 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "80UN"), + }, + }, + { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"), |