From 40c8ee428e7c78d030acb10b05132ac4f5789b0e Mon Sep 17 00:00:00 2001
From: TJ <linux@tjworld.net>
Date: Mon, 3 Aug 2009 13:39:09 -0700
Subject: [PATCH] --- yaml --- r: 156439 b: refs/heads/master c:
 194934785a846e0a7b1b674b7b475a9d0125d2f8 h: refs/heads/master i:   156437:
 8ee05ae7ce2ab403dd9612bfa9344d1f8a644bad   156435:
 1ad6cef782dbf9a083f48e44b27e8c35dcd6ba1e   156431:
 8068d5cdbc8dffc38b0e77230076759acea0ccd2 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/input/misc/wistron_btns.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a48a770e84bc..af2d26231123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 685aaca751271b2c5191901931a19ccaceeae1ce
+refs/heads/master: 194934785a846e0a7b1b674b7b475a9d0125d2f8
diff --git a/trunk/drivers/input/misc/wistron_btns.c b/trunk/drivers/input/misc/wistron_btns.c
index 26e17a9a22eb..27ee976eb54c 100644
--- a/trunk/drivers/input/misc/wistron_btns.c
+++ b/trunk/drivers/input/misc/wistron_btns.c
@@ -611,6 +611,20 @@ static struct key_entry keymap_wistron_generic[] __initdata = {
 	{ KE_END, 0 }
 };
 
+static struct key_entry keymap_prestigio[] __initdata = {
+	{ KE_KEY,  0x11, {KEY_PROG1} },
+	{ KE_KEY,  0x12, {KEY_PROG2} },
+	{ KE_WIFI,  0x30 },
+	{ KE_KEY,  0x22, {KEY_REWIND} },
+	{ KE_KEY,  0x23, {KEY_FORWARD} },
+	{ KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+	{ KE_KEY,  0x25, {KEY_STOPCD} },
+	{ KE_KEY,  0x31, {KEY_MAIL} },
+	{ KE_KEY,  0x36, {KEY_WWW} },
+	{ KE_END,  0 }
+};
+
+
 /*
  * If your machine is not here (which is currently rather likely), please send
  * a list of buttons and their key codes (reported when loading this module
@@ -971,6 +985,8 @@ static int __init select_keymap(void)
 	if (keymap_name != NULL) {
 		if (strcmp (keymap_name, "1557/MS2141") == 0)
 			keymap = keymap_wistron_ms2141;
+		else if (strcmp (keymap_name, "prestigio") == 0)
+			keymap = keymap_prestigio;
 		else if (strcmp (keymap_name, "generic") == 0)
 			keymap = keymap_wistron_generic;
 		else {