--- a/drivers/media/dvb/ttpci/budget-ci.c	2004-05-10 03:32:01.000000000 +0100
+++ b/drivers/media/dvb/ttpci/budget-ci.c	2004-03-27 18:41:33.000000000 +0000
@@ -140,52 +125,48 @@
 */
 static  u16 key_map[64] = {
 	/* 0x0X */
-	KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8,
-	KEY_9,
-	KEY_ENTER,
+	BTN_0, BTN_1, BTN_2, BTN_3, BTN_4, BTN_5, BTN_6, BTN_7, BTN_8, BTN_9,
+	0,
 	KEY_RED,
-	KEY_POWER,              /* RADIO on Hauppauge */
-	KEY_MUTE,
+	KEY_OPTION,
+	KEY_MENU,
 	0,
-	KEY_A,                  /* TV on Hauppauge */
+	KEY_MUTE,
 	/* 0x1X */
 	KEY_VOLUMEUP, KEY_VOLUMEDOWN,
+	0, 0, 0,
+	0, 0, 0,
+	KEY_REWIND, 
+	0, 0, 0,
 	0, 0,
-	KEY_B,
-	0, 0, 0, 0, 0, 0, 0,
-	KEY_UP, KEY_DOWN,
-	KEY_OPTION,             /* RESERVED on Hauppauge */
-	KEY_BREAK,
+	BTN_FORWARD,
+	KEY_EXIT,
 	/* 0x2X */
 	KEY_CHANNELUP, KEY_CHANNELDOWN,
-	KEY_PREVIOUS,           /* Prev. Ch on Zenith, SOURCE on Hauppauge */
-	0, KEY_RESTART, KEY_OK,
-	KEY_CYCLEWINDOWS,       /* MINIMIZE on Hauppauge */
-	0,
-	KEY_ENTER,              /* VCR mode on Zenith */
-	KEY_PAUSE,
-	0,
-	KEY_RIGHT, KEY_LEFT,
-	0,
-	KEY_MENU,               /* FULL SCREEN on Hauppauge */
+	0, 0,
+	BTN_BACK,
+	KEY_OK,
+	0, 0, 0,
+	KEY_BLUE,
+	0, 0, 0, 0,
+	KEY_GREEN,
 	0,
 	/* 0x3X */
-	KEY_SLOW,
-	KEY_PREVIOUS,           /* VCR mode on Zenith */
+	KEY_PLAYPAUSE,
+	0,
 	KEY_REWIND,
 	0,
 	KEY_FASTFORWARD,
-	KEY_PLAY, KEY_STOP,
+	KEY_PLAY,
+	KEY_STOP,
 	KEY_RECORD,
-	KEY_TUNER,              /* TV/VCR on Zenith */
-	0,
-	KEY_C,
-	0,
-	KEY_EXIT,
-	KEY_POWER2,
-	KEY_TUNER,              /* VCR mode on Zenith */
-	0,
-};
+	KEY_YELLOW,
+	0, 0,
+	KEY_GOTO,
+	KEY_UNKNOWN,
+	KEY_POWER,
+	0, 0,
+ };
 
 
 static void msp430_ir_debounce (unsigned long data)