From 0e1fecab5e5c1d2685ff695e62054833a1533154 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 24 Jan 2011 12:18:39 -0300
Subject: [PATCH] --- yaml --- r: 242169 b: refs/heads/master c:
 04efa85e03b25c5b519e495485d005a8b69ccdab h: refs/heads/master i:   242167:
 d3cab3b3d3c7541b1dc9a9591647fdc2003a8e6c v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/media/rc/keymaps/rc-imon-mce.c              | 2 +-
 trunk/drivers/media/rc/keymaps/rc-imon-pad.c              | 2 +-
 trunk/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 +-
 trunk/drivers/media/rc/keymaps/rc-rc6-mce.c               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 53dcc4b83400..6ec4e857f265 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9e9f41c45536b68b14934949104cb40149e94f1
+refs/heads/master: 04efa85e03b25c5b519e495485d005a8b69ccdab
diff --git a/trunk/drivers/media/rc/keymaps/rc-imon-mce.c b/trunk/drivers/media/rc/keymaps/rc-imon-mce.c
index cb67184e015c..937a81989f00 100644
--- a/trunk/drivers/media/rc/keymaps/rc-imon-mce.c
+++ b/trunk/drivers/media/rc/keymaps/rc-imon-mce.c
@@ -111,7 +111,7 @@ static struct rc_map_table imon_mce[] = {
 	{ 0x800ff44d, KEY_TITLE },
 
 	{ 0x800ff40c, KEY_POWER },
-	{ 0x800ff40d, KEY_PROG1 }, /* Windows MCE button */
+	{ 0x800ff40d, KEY_LEFTMETA }, /* Windows MCE button */
 
 };
 
diff --git a/trunk/drivers/media/rc/keymaps/rc-imon-pad.c b/trunk/drivers/media/rc/keymaps/rc-imon-pad.c
index eef46b73ca7b..63d42bd24c9e 100644
--- a/trunk/drivers/media/rc/keymaps/rc-imon-pad.c
+++ b/trunk/drivers/media/rc/keymaps/rc-imon-pad.c
@@ -125,7 +125,7 @@ static struct rc_map_table imon_pad[] = {
 	{ 0x2b8195b7, KEY_CONTEXT_MENU }, /* Left Menu*/
 	{ 0x02000065, KEY_COMPOSE }, /* RightMenu */
 	{ 0x28b715b7, KEY_COMPOSE }, /* RightMenu */
-	{ 0x2ab195b7, KEY_PROG1 }, /* Go or MultiMon */
+	{ 0x2ab195b7, KEY_LEFTMETA }, /* Go or MultiMon */
 	{ 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */
 };
 
diff --git a/trunk/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c b/trunk/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
index e45f0b8759d0..08d183120e41 100644
--- a/trunk/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
+++ b/trunk/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
@@ -17,7 +17,7 @@
  */
 
 static struct rc_map_table kworld_plus_tv_analog[] = {
-	{ 0x0c, KEY_PROG1 },		/* Kworld key */
+	{ 0x0c, KEY_LEFTMETA },		/* Kworld key */
 	{ 0x16, KEY_CLOSECD },		/* -> ) */
 	{ 0x1d, KEY_POWER2 },
 
diff --git a/trunk/drivers/media/rc/keymaps/rc-rc6-mce.c b/trunk/drivers/media/rc/keymaps/rc-rc6-mce.c
index 2f5dc0622b94..8dd519ecc58e 100644
--- a/trunk/drivers/media/rc/keymaps/rc-rc6-mce.c
+++ b/trunk/drivers/media/rc/keymaps/rc-rc6-mce.c
@@ -30,7 +30,7 @@ static struct rc_map_table rc6_mce[] = {
 	{ 0x800f040a, KEY_DELETE },
 	{ 0x800f040b, KEY_ENTER },
 	{ 0x800f040c, KEY_POWER },		/* PC Power */
-	{ 0x800f040d, KEY_PROG1 },		/* Windows MCE button */
+	{ 0x800f040d, KEY_LEFTMETA },		/* Windows MCE button */
 	{ 0x800f040e, KEY_MUTE },
 	{ 0x800f040f, KEY_INFO },