Commit c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78

Authored by Linus Torvalds

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

Showing 1 changed file Side-by-side Diff

drivers/input/serio/i8042-x86ia64io.h
... ... @@ -466,6 +466,13 @@
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 476 /* Avatar AVIU-145A6 */
470 477 .matches = {
471 478 DMI_MATCH(DMI_SYS_VENDOR, "Intel"),