--- dvb/linux/drivers/media/rc/keymaps/rc-medion-x10-or2x.c	2012-05-21 05:45:41.000000000 +0200
+++ dvb/linux/drivers/media/rc/keymaps/rc-medion-x10-or2x.c-n	2012-10-10 03:10:42.674823990 +0200
@@ -27,7 +27,7 @@
 #include <media/rc-map.h>
 
 static struct rc_map_table medion_x10_or2x[] = {
-	{ 0x02, KEY_POWER },
+	{ 0x02, KEY_POWER2 },
 	{ 0x16, KEY_TEXT },   /* "T" in a box, for teletext */
 
 	{ 0x09, KEY_VOLUMEUP },
@@ -42,9 +42,9 @@
 	{ 0x35, KEY_BLUE },
 
 	{ 0x18, KEY_PVR },    /* record symbol inside a tv symbol */
-	{ 0x04, KEY_DVD },    /* disc symbol */
+	{ 0x04, KEY_PROG2 },    /* disc symbol */
 	{ 0x31, KEY_EPG },    /* a tv schedule symbol */
-	{ 0x1c, KEY_TV },     /* play symbol inside a tv symbol */
+	{ 0x1c, KEY_PROG1 },     /* play symbol inside a tv symbol */
 	{ 0x20, KEY_BACK },
 	{ 0x2f, KEY_INFO },
 
@@ -54,7 +54,7 @@
 	{ 0x1f, KEY_RIGHT },
 	{ 0x1e, KEY_OK },
 
-	{ 0x1b, KEY_MEDIA },  /* Windows MCE button */
+	{ 0x1b, KEY_MENU },  /* Windows MCE button */
 
 	{ 0x21, KEY_PREVIOUS },
 	{ 0x23, KEY_NEXT },
@@ -75,10 +75,10 @@
 	{ 0x14, KEY_8 },
 	{ 0x15, KEY_9 },
 	{ 0x17, KEY_0 },
-	{ 0x30, KEY_CLEAR },
-	{ 0x36, KEY_ENTER },
-	{ 0x37, KEY_NUMERIC_STAR },
-	{ 0x38, KEY_NUMERIC_POUND },
+	{ 0x30, KEY_PROG3 },
+	{ 0x36, KEY_PROG4 },
+	{ 0x37, KEY_SCREEN },
+	{ 0x38, KEY_SUBTITLE },
 };
 
 static struct rc_map_list medion_x10_or2x_map = {