1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index dfb81ff1d9a..6b22ec64ab0 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -331,7 +331,7 @@ static int opera1_pid_filter_control(struct dvb_usb_adapter *adap, int onoff)
         return 0;
 }
 
-static struct dvb_usb_rc_key ir_codes_opera1_table[] = {
+static struct ir_scancode ir_codes_opera1_table[] = {
         {0x5fa0, KEY_1},
         {0x51af, KEY_2},
         {0x5da2, KEY_3},
@@ -407,9 +407,9 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
                 for (i = 0; i < ARRAY_SIZE(ir_codes_opera1_table); i++) {
                         if (rc5_scan(&ir_codes_opera1_table[i]) == (send_key & 0xffff)) {
                                 *state = REMOTE_KEY_PRESSED;
-                                *event = ir_codes_opera1_table[i].event;
+                                *event = ir_codes_opera1_table[i].keycode;
                                 opst->last_key_pressed =
-                                        ir_codes_opera1_table[i].event;
+                                        ir_codes_opera1_table[i].keycode;
                                 break;
                         }
                         opst->last_key_pressed = 0;
@@ -498,10 +498,12 @@ static struct dvb_usb_device_properties opera1_properties = {
         .power_ctrl = opera1_power_ctrl,
         .i2c_algo = &opera1_i2c_algo,
 
-        .rc_key_map = ir_codes_opera1_table,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
-        .rc_interval = 200,
-        .rc_query = opera1_rc_query,
+        .rc.legacy = {
+                .rc_key_map = ir_codes_opera1_table,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
+                .rc_interval = 200,
+                .rc_query = opera1_rc_query,
+        },
         .read_mac_address = opera1_read_mac_address,
         .generic_bulk_ctrl_endpoint = 0x00,
         /* parameter for the MPEG2-data transfer */