8 files changed, 18 insertions, 18 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 956f7ae2e510..4c2a689c820e 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -408,7 +408,7 @@ struct rc_map_table rc_map_dibusb_table[] = {
 
         { 0x8008, KEY_DVD },
         { 0x8009, KEY_AUDIO },
-        { 0x800a, KEY_MEDIA },      /* Pictures */
+        { 0x800a, KEY_IMAGES },      /* Pictures */
         { 0x800b, KEY_VIDEO },
 
         { 0x800c, KEY_BACK },
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index da9dc91ce910..51bfd42387c2 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -632,9 +632,9 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = {
         { 0x16, KEY_POWER },
         { 0x17, KEY_FAVORITES },
         { 0x0f, KEY_TEXT },
-        { 0x48, KEY_MEDIA },            /* preview */
+        { 0x48, KEY_PROGRAM },          /* preview */
         { 0x1c, KEY_EPG },
-        { 0x04, KEY_LIST },                     /* record list */
+        { 0x04, KEY_LIST },             /* record list */
         { 0x03, KEY_1 },
         { 0x01, KEY_2 },
         { 0x06, KEY_3 },
@@ -674,14 +674,14 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = {
         { 0x0e, KEY_MUTE },
 /*      { 0x49, KEY_LR },       */              /* L/R */
         { 0x07, KEY_SLEEP },            /* Hibernate */
-        { 0x08, KEY_MEDIA },            /* A/V */
-        { 0x0e, KEY_MENU },                     /* Recall */
+        { 0x08, KEY_VIDEO },            /* A/V */
+        { 0x0e, KEY_MENU },             /* Recall */
         { 0x45, KEY_ZOOMIN },
         { 0x46, KEY_ZOOMOUT },
-        { 0x18, KEY_TV },                       /* Red */
-        { 0x53, KEY_VCR },                      /* Green */
-        { 0x5e, KEY_SAT },                      /* Yellow */
-        { 0x5f, KEY_PLAYER },           /* Blue */
+        { 0x18, KEY_RED },              /* Red */
+        { 0x53, KEY_GREEN },            /* Green */
+        { 0x5e, KEY_YELLOW },           /* Yellow */
+        { 0x5f, KEY_BLUE },             /* Blue */
 };
 
 /* DVB USB Driver stuff */
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 9d3cd2de46fc..bc350e982b72 100644
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -47,7 +47,7 @@ static struct rc_map_table rc_map_haupp_table[] = {
         { 0x1e17, KEY_RIGHT },
         { 0x1e18, KEY_VIDEO },
         { 0x1e19, KEY_AUDIO },
-        { 0x1e1a, KEY_MEDIA },
+        { 0x1e1a, KEY_IMAGES },
         { 0x1e1b, KEY_EPG },
         { 0x1e1c, KEY_TV },
         { 0x1e1e, KEY_NEXT },
diff --git a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
index bdf97b74cf90..22f54d413a35 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
@@ -52,7 +52,7 @@ static struct rc_map_table avermedia_cardbus[] = {
         { 0x28, KEY_SELECT },           /* Select */
         { 0x29, KEY_BLUE },             /* Blue/Picture */
         { 0x2a, KEY_BACKSPACE },        /* Back */
-        { 0x2b, KEY_MEDIA },            /* PIP (Picture-in-picture) */
+        { 0x2b, KEY_VIDEO },            /* PIP (Picture-in-picture) */
         { 0x2c, KEY_DOWN },
         { 0x2e, KEY_DOT },
         { 0x2f, KEY_TV },               /* Live TV */
diff --git a/drivers/media/rc/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c
index 937a81989f00..0ea2aa190d81 100644
--- a/drivers/media/rc/keymaps/rc-imon-mce.c
+++ b/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_LEFTMETA }, /* Windows MCE button */
+        { 0x800ff40d, KEY_MEDIA }, /* Windows MCE button */
 
 };
 
diff --git a/drivers/media/rc/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c
index 63d42bd24c9e..75d3843fdc30 100644
--- a/drivers/media/rc/keymaps/rc-imon-pad.c
+++ b/drivers/media/rc/keymaps/rc-imon-pad.c
@@ -87,7 +87,7 @@ static struct rc_map_table imon_pad[] = {
 
         { 0x2b8515b7, KEY_VIDEO },
         { 0x299195b7, KEY_AUDIO },
-        { 0x2ba115b7, KEY_CAMERA },
+        { 0x2ba115b7, KEY_IMAGES },
         { 0x28a515b7, KEY_TV },
         { 0x29a395b7, KEY_DVD },
         { 0x29a295b7, KEY_DVD },
@@ -97,7 +97,7 @@ static struct rc_map_table imon_pad[] = {
         { 0x2ba395b7, KEY_MENU },
 
         { 0x288515b7, KEY_BOOKMARKS },
-        { 0x2ab715b7, KEY_MEDIA }, /* Thumbnail */
+        { 0x2ab715b7, KEY_CAMERA }, /* Thumbnail */
         { 0x298595b7, KEY_SUBTITLE },
         { 0x2b8595b7, KEY_LANGUAGE },
 
@@ -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_LEFTMETA }, /* Go or MultiMon */
+        { 0x2ab195b7, KEY_MEDIA }, /* Go or MultiMon */
         { 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */
 };
 
diff --git a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
index 08d183120e41..7fa17a369f2d 100644
--- a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
+++ b/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_LEFTMETA },         /* Kworld key */
+        { 0x0c, KEY_MEDIA },            /* Kworld key */
         { 0x16, KEY_CLOSECD },          /* -> ) */
         { 0x1d, KEY_POWER2 },
 
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
index 8dd519ecc58e..01b69bcc8666 100644
--- a/drivers/media/rc/keymaps/rc-rc6-mce.c
+++ b/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_LEFTMETA },           /* Windows MCE button */
+        { 0x800f040d, KEY_MEDIA },              /* Windows MCE button */
         { 0x800f040e, KEY_MUTE },
         { 0x800f040f, KEY_INFO },
 
@@ -87,7 +87,7 @@ static struct rc_map_table rc6_mce[] = {
 
         { 0x800f0465, KEY_POWER2 },     /* TV Power */
         { 0x800f046e, KEY_PLAYPAUSE },
-        { 0x800f046f, KEY_MEDIA },      /* Start media application (NEW) */
+        { 0x800f046f, KEY_PLAYER },     /* Start media application (NEW) */
 
         { 0x800f0480, KEY_BRIGHTNESSDOWN },
         { 0x800f0481, KEY_PLAYPAUSE },