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 / dibusb-mc.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 1cbc41cb4e8fa0489d9e98b6d8ecf099275bab55..c1d9094b61e59f696cdbfbfb8c3da2fed0eaebf7 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -83,8 +83,8 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
 
        .rc.legacy = {
                .rc_interval      = DEFAULT_RC_INTERVAL,
-               .rc_key_map       = ir_codes_dibusb_table,
-               .rc_key_map_size  = 111, /* FIXME */
+               .rc_map_table     = rc_map_dibusb_table,
+               .rc_map_size      = 111, /* FIXME */
                .rc_query         = dibusb_rc_query,
        },