From a1267c71c288fa53cf4c635935d06ad276d6331e Mon Sep 17 00:00:00 2001
From: Christoph Fritz <chf.fritz@googlemail.com>
Date: Sat, 13 Mar 2010 22:26:23 -0800
Subject: [PATCH] --- yaml --- r: 188059 b: refs/heads/master c:
 31968ecf584330b51a25b7bf881c2b632a02a3fb h: refs/heads/master i:   188057:
 b4f5e9c7059e8e934cfa5dcc751d4bc7079e65e3   188055:
 e30fb0fb851d6f0d0914c7bed53c7fefb8a5dbf5 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 853f5cfe2ba5..a47cf81d9d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91ed059a080c6f9a7ba525e5027c65d19115d15
+refs/heads/master: 31968ecf584330b51a25b7bf881c2b632a02a3fb
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index 3696cab40598..ead0494721d0 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -441,6 +441,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "E1210"),
 		},
 	},
+	{
+		/* Medion Akoya E1222 */
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "E122X"),
+		},
+	},
 	{
 		/* Mivvy M310 */
 		.matches = {