diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
| commit | 9440e4b9fa1c6d76f3c8e11e0887218c9894bf4b (patch) | |
| tree | 940d9ee8e703936e48ba43c40d3e3488c54a30f7 /drivers/input/serio/i8042-x86ia64io.h | |
| parent | 4eed929a29a419e367b75ff5e4ab3800d4ce35dd (diff) | |
| parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.12-rt
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
| -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 68f5f4a0f1e7..418701947800 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -793,6 +793,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P34"), }, }, + { + /* Schenker XMG C504 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "XMG"), + DMI_MATCH(DMI_PRODUCT_NAME, "C504"), + }, + }, { } }; |