diff options
| author | Todor Minchev <todor.minchev@intel.com> | 2014-12-02 15:16:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-02 21:34:40 -0800 |
| commit | 8195077c4a93486f715edac3e9f1503df7dec60a (patch) | |
| tree | 302ccaafad3ef6562732ba638b40a29d29f46939 /drivers/input/serio | |
| parent | 5447326ff7e42ae36b85caedb2a787ff4db646f4 (diff) | |
| download | linux-8195077c4a93486f715edac3e9f1503df7dec60a.tar.gz linux-8195077c4a93486f715edac3e9f1503df7dec60a.tar.bz2 linux-8195077c4a93486f715edac3e9f1503df7dec60a.zip | |
Input: i8042 - do not try to load on Intel NUC D54250WYK
The Intel NUC D54250WYK has no PS/2 controller, however the DSDT declares
PS/2 devices which trigger the loading of the i8042 driver.
Signed-off-by: Todor Minchev <todor.minchev@intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index a0bcbb64d06d..a26366a263a5 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -314,6 +314,16 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { }, }, { + /* + * Intel NUC D54250WYK - does not have i8042 controller but + * declares PS/2 devices in DSDT. + */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"), + DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), + }, + }, + { /* MSI Wind U-100 */ .matches = { DMI_MATCH(DMI_BOARD_NAME, "U-100"), |