summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-26 11:04:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-26 11:04:31 -0700
commitc6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78 (patch)
tree37df1d20532d61efbe2b4c33fb0ed376f08a3632 /drivers/input
parentd2865c7d4ef818421941579e185c1e4743692f85 (diff)
parent3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff)
downloadlinux-c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78.tar.gz
linux-c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78.tar.bz2
linux-c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78.zip
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
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h7
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[] = {
},
},
{
+ /* Asus X450LCP */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"),
+ },
+ },
+ {
/* Avatar AVIU-145A6 */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Intel"),