From bc86ebbb02e37c8e08bc5beedd3f4e0881f897c3 Mon Sep 17 00:00:00 2001
From: Cjacker Huang <cjacker@gmail.com>
Date: Tue, 8 Aug 2006 23:38:22 -0400
Subject: [PATCH] --- yaml --- r: 37897 b: refs/heads/master c:
 e2df452b8adca9d3e3195ff7d91be375342964d7 h: refs/heads/master i:   37895:
 67c79ec9e35bf0616046937c8f7173ff648a5204 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/input/serio/i8042-x86ia64io.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ef060bfecdc..a25100650383 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3882bb56e31dbb3950e51c1ba914ef2f445650c
+refs/heads/master: e2df452b8adca9d3e3195ff7d91be375342964d7
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index f606e96bc2f4..2232ab71fb40 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/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"),
+		},
+	},
 	{ }
 };