1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index ebb08cfe2731..11fd038a078f 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -611,10 +611,24 @@ static struct key_entry keymap_wistron_generic[] __initdata = {
         { KE_END, 0 }
 };
 
+static struct key_entry keymap_aopen_1557[] __initdata = {
+        { KE_KEY,  0x01, {KEY_HELP} },
+        { 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 }
+};
+
 static struct key_entry keymap_prestigio[] __initdata = {
         { KE_KEY,  0x11, {KEY_PROG1} },
         { KE_KEY,  0x12, {KEY_PROG2} },
-        { KE_WIFI,  0x30 },
+        { KE_WIFI, 0x30 },
         { KE_KEY,  0x22, {KEY_REWIND} },
         { KE_KEY,  0x23, {KEY_FORWARD} },
         { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
@@ -985,6 +999,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, "aopen1557") == 0)
+                        keymap = keymap_aopen_1557;
                 else if (strcmp (keymap_name, "prestigio") == 0)
                         keymap = keymap_prestigio;
                 else if (strcmp (keymap_name, "generic") == 0)