Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / drivers / media / dvb / dvb-usb / opera1.c

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 1f1b7d6..7e569f4 100644 (file)
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -342,23 +342,22 @@ static struct rc_map_table rc_map_opera1_table[] = {
        {0x49b6, KEY_8},
        {0x05fa, KEY_9},
        {0x45ba, KEY_0},
-       {0x09f6, KEY_UP},       /*chanup */
-       {0x1be5, KEY_DOWN},     /*chandown */
-       {0x5da3, KEY_LEFT},     /*voldown */
-       {0x5fa1, KEY_RIGHT},    /*volup */
-       {0x07f8, KEY_SPACE},    /*tab */
-       {0x1fe1, KEY_ENTER},    /*play ok */
-       {0x1be4, KEY_Z},        /*zoom */
-       {0x59a6, KEY_M},        /*mute */
-       {0x5ba5, KEY_F},        /*tv/f */
-       {0x19e7, KEY_R},        /*rec */
-       {0x01fe, KEY_S},        /*Stop */
-       {0x03fd, KEY_P},        /*pause */
-       {0x03fc, KEY_W},        /*<- -> */
-       {0x07f9, KEY_C},        /*capture */
-       {0x47b9, KEY_Q},        /*exit */
-       {0x43bc, KEY_O},        /*power */
-
+       {0x09f6, KEY_CHANNELUP},        /*chanup */
+       {0x1be5, KEY_CHANNELDOWN},      /*chandown */
+       {0x5da3, KEY_VOLUMEDOWN},       /*voldown */
+       {0x5fa1, KEY_VOLUMEUP},         /*volup */
+       {0x07f8, KEY_SPACE},            /*tab */
+       {0x1fe1, KEY_OK},               /*play ok */
+       {0x1be4, KEY_ZOOM},             /*zoom */
+       {0x59a6, KEY_MUTE},             /*mute */
+       {0x5ba5, KEY_RADIO},            /*tv/f */
+       {0x19e7, KEY_RECORD},           /*rec */
+       {0x01fe, KEY_STOP},             /*Stop */
+       {0x03fd, KEY_PAUSE},            /*pause */
+       {0x03fc, KEY_SCREEN},           /*<- -> */
+       {0x07f9, KEY_CAMERA},           /*capture */
+       {0x47b9, KEY_ESC},              /*exit */
+       {0x43bc, KEY_POWER2},           /*power */
 };
 
 static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)