1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 036893fa448..f13791ca599 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -99,7 +99,7 @@ static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff)
 
 /* The keymapping struct. Somehow this should be loaded to the driver, but
  * currently it is hardcoded. */
-static struct dvb_usb_rc_key ir_codes_vp7045_table[] = {
+static struct ir_scancode ir_codes_vp7045_table[] = {
         { 0x0016, KEY_POWER },
         { 0x0010, KEY_MUTE },
         { 0x0003, KEY_1 },
@@ -168,7 +168,7 @@ static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         for (i = 0; i < ARRAY_SIZE(ir_codes_vp7045_table); i++)
                 if (rc5_data(&ir_codes_vp7045_table[i]) == key) {
                         *state = REMOTE_KEY_PRESSED;
-                        *event = ir_codes_vp7045_table[i].event;
+                        *event = ir_codes_vp7045_table[i].keycode;
                         break;
                 }
         return 0;
@@ -259,10 +259,12 @@ static struct dvb_usb_device_properties vp7045_properties = {
         .power_ctrl       = vp7045_power_ctrl,
         .read_mac_address = vp7045_read_mac_addr,
 
-        .rc_interval      = 400,
-        .rc_key_map       = ir_codes_vp7045_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp7045_table),
-        .rc_query         = vp7045_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 400,
+                .rc_key_map       = ir_codes_vp7045_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp7045_table),
+                .rc_query         = vp7045_rc_query,
+        },
 
         .num_device_descs = 2,
         .devices = {