diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 14:04:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 14:04:31 -0400 |
| commit | c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78 (patch) | |
| tree | 37df1d20532d61efbe2b4c33fb0ed376f08a3632 | |
| parent | d2865c7d4ef818421941579e185c1e4743692f85 (diff) | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"A small fixup to i8042 adding Asus X450LCP to the nomux list"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - fix Asus X450LCP touchpad detection
| -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 713e3ddb43bd..40b7d6c0ff17 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -466,6 +466,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { | |||
| 466 | }, | 466 | }, |
| 467 | }, | 467 | }, |
| 468 | { | 468 | { |
| 469 | /* Asus X450LCP */ | ||
| 470 | .matches = { | ||
| 471 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), | ||
| 472 | DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"), | ||
| 473 | }, | ||
| 474 | }, | ||
| 475 | { | ||
| 469 | /* Avatar AVIU-145A6 */ | 476 | /* Avatar AVIU-145A6 */ |
| 470 | .matches = { | 477 | .matches = { |
| 471 | DMI_MATCH(DMI_SYS_VENDOR, "Intel"), | 478 | DMI_MATCH(DMI_SYS_VENDOR, "Intel"), |