summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorCjacker Huang <cjacker@gmail.com>2006-08-08 23:38:22 -0400
committerDmitry Torokhov <dtor@insightbb.com>2006-08-08 23:38:22 -0400
commite2df452b8adca9d3e3195ff7d91be375342964d7 (patch)
tree7fc61a6ce47b07db7ed06773b9fbc58ceff9735f /drivers/input/serio
parente3882bb56e31dbb3950e51c1ba914ef2f445650c (diff)
downloadop-kernel-dev-e2df452b8adca9d3e3195ff7d91be375342964d7.zip
op-kernel-dev-e2df452b8adca9d3e3195ff7d91be375342964d7.tar.gz
Input: i8042 - add Amoi to the MUX blacklist
ALPS touchpad on Amoi laptops (Amoi is a vendor in China) is not detected when keyboard controller is in MUX mode, add to blacklist. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
-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 f606e96..2232ab7 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -180,6 +180,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"),
},
},
+ {
+ .ident = "Amoi M636/A737",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
+ },
+ },
{ }
};
OpenPOWER on IntegriCloud