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 / vp702x.c

diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c
index 5c9f3275aaa0f3fac30117c3a56f1f873c30d5c7..7890e75600dfe07c91d67ec32c723f4fb36f0b65 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/drivers/media/dvb/dvb-usb/vp702x.c
@@ -174,7 +174,7 @@ static int vp702x_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 }
 
 /* keys for the enclosed remote control */
-static struct ir_scancode ir_codes_vp702x_table[] = {
+static struct rc_map_table rc_map_vp702x_table[] = {
        { 0x0001, KEY_1 },
        { 0x0002, KEY_2 },
 };
@@ -197,10 +197,10 @@ static int vp702x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                return 0;
        }
 
-       for (i = 0; i < ARRAY_SIZE(ir_codes_vp702x_table); i++)
-               if (rc5_custom(&ir_codes_vp702x_table[i]) == key[1]) {
+       for (i = 0; i < ARRAY_SIZE(rc_map_vp702x_table); i++)
+               if (rc5_custom(&rc_map_vp702x_table[i]) == key[1]) {
                        *state = REMOTE_KEY_PRESSED;
-                       *event = ir_codes_vp702x_table[i].keycode;
+                       *event = rc_map_vp702x_table[i].keycode;
                        break;
                }
        return 0;
@@ -284,8 +284,8 @@ static struct dvb_usb_device_properties vp702x_properties = {
        .read_mac_address = vp702x_read_mac_addr,
 
        .rc.legacy = {
-               .rc_key_map       = ir_codes_vp702x_table,
-               .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp702x_table),
+               .rc_map_table       = rc_map_vp702x_table,
+               .rc_map_size  = ARRAY_SIZE(rc_map_vp702x_table),
                .rc_interval      = 400,
                .rc_query         = vp702x_rc_query,
        },