Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[sfrench/cifs-2.6.git] / drivers / media / dvb / dvb-usb / dibusb-mc.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 588308eb66388c62c1e017873accbd485c4318a8..1cbc41cb4e8fa0489d9e98b6d8ecf099275bab55 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -81,10 +81,12 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
        },
        .power_ctrl       = dibusb2_0_power_ctrl,
 
-       .rc_interval      = DEFAULT_RC_INTERVAL,
-       .rc_key_map       = ir_codes_dibusb_table,
-       .rc_key_map_size  = 111, /* FIXME */
-       .rc_query         = dibusb_rc_query,
+       .rc.legacy = {
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_key_map       = ir_codes_dibusb_table,
+               .rc_key_map_size  = 111, /* FIXME */
+               .rc_query         = dibusb_rc_query,
+       },
 
        .i2c_algo         = &dibusb_i2c_algo,