From b5f8e3f86f71f01a32bc7866e2fff1679d59fb30 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 21 Dec 2005 00:51:51 -0500
Subject: [PATCH] --- yaml --- r: 16784 b: refs/heads/master c:
 4eb38ac0629716871591b594fe0c611b19613983 h: refs/heads/master 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 62ebd53133db..fde8cb1705c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba44995a1e84b6cebf32e61d9492e8e133d192ce
+refs/heads/master: 4eb38ac0629716871591b594fe0c611b19613983
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index 273bb3b08cfa..057beca1986a 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -158,6 +158,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"),
 		},
 	},
+	{
+		.ident = "Sharp Actius MM20",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "SHARP"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "PC-MM20 Series"),
+		},
+	},
 	{ }
 };