diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:01:44 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:01:44 +0800 |
| commit | 2e67ba554184199114a948786e47decb8b9a469b (patch) | |
| tree | 1ed97bafe8b2c58171dceb88c6a6f1ff86f52084 /drivers/input/serio/i8042-x86ia64io.h | |
| parent | e5dd309b741e2e4d7e71da61e07249f91c80065e (diff) | |
| parent | ac3d826bef907afe35f80ecccbcdd57223df4b88 (diff) | |
Merge tag 'v3.18.45' into linux-linaro-lsk-v3.18lsk-v3.18-16.12
This is the 3.18.45 stable release
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 89daac119a69..faccb8349647 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -783,6 +783,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"), + }, + }, { } }; |