diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 21:24:42 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 21:24:42 +0300 |
| commit | cbb245239282870bc6f54d5137dfe0f84b48ea72 (patch) | |
| tree | dcdd8041d7bb5cddacfe086785dd370aa1a7a6ea /drivers/input/serio | |
| parent | 94a332bd8626f6c32e7ba5835dd17eeddbb76e89 (diff) | |
| parent | 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 (diff) | |
| download | linux-cbb245239282870bc6f54d5137dfe0f84b48ea72.tar.xz | |
Merge tag 'v5.12' into next
Sync up with mainline to get the latest device tree bindings and kernel
APIs.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 9119e12a5778..a5a003553646 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -588,6 +588,7 @@ static const struct dmi_system_id i8042_dmi_noselftest_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ }, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */ |