Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.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 f896337b453518e603419beedd5093a9a5f1fb16..1f1b7d6980a5ba33ddeb1b684a2a29e806aad093 100644 (file)
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -35,7 +35,7 @@
 struct opera1_state {
        u32 last_key_pressed;
 };
-struct ir_codes_opera_table {
+struct rc_map_opera_table {
        u32 keycode;
        u32 event;
 };
@@ -331,7 +331,7 @@ static int opera1_pid_filter_control(struct dvb_usb_adapter *adap, int onoff)
        return 0;
 }
 
-static struct ir_scancode ir_codes_opera1_table[] = {
+static struct rc_map_table rc_map_opera1_table[] = {
        {0x5fa0, KEY_1},
        {0x51af, KEY_2},
        {0x5da2, KEY_3},
@@ -404,12 +404,12 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
 
                send_key = (send_key & 0xffff) | 0x0100;
 
-               for (i = 0; i < ARRAY_SIZE(ir_codes_opera1_table); i++) {
-                       if (rc5_scan(&ir_codes_opera1_table[i]) == (send_key & 0xffff)) {
+               for (i = 0; i < ARRAY_SIZE(rc_map_opera1_table); i++) {
+                       if (rc5_scan(&rc_map_opera1_table[i]) == (send_key & 0xffff)) {
                                *state = REMOTE_KEY_PRESSED;
-                               *event = ir_codes_opera1_table[i].keycode;
+                               *event = rc_map_opera1_table[i].keycode;
                                opst->last_key_pressed =
-                                       ir_codes_opera1_table[i].keycode;
+                                       rc_map_opera1_table[i].keycode;
                                break;
                        }
                        opst->last_key_pressed = 0;
@@ -497,8 +497,8 @@ static struct dvb_usb_device_properties opera1_properties = {
        .i2c_algo = &opera1_i2c_algo,
 
        .rc.legacy = {
-               .rc_key_map = ir_codes_opera1_table,
-               .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
+               .rc_map_table = rc_map_opera1_table,
+               .rc_map_size = ARRAY_SIZE(rc_map_opera1_table),
                .rc_interval = 200,
                .rc_query = opera1_rc_query,
        },