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 / cinergyT2-core.c

diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
index 4f5aa83fc1fcb5c88ce6e185b19a01da993846ce..16f2ce2bc15a7a73108913a787527d6a022a725d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
@@ -84,7 +84,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
 
-static struct ir_scancode ir_codes_cinergyt2_table[] = {
+static struct rc_map_table rc_map_cinergyt2_table[] = {
        { 0x0401, KEY_POWER },
        { 0x0402, KEY_1 },
        { 0x0403, KEY_2 },
@@ -219,8 +219,8 @@ static struct dvb_usb_device_properties cinergyt2_properties = {
 
        .rc.legacy = {
                .rc_interval      = 50,
-               .rc_key_map       = ir_codes_cinergyt2_table,
-               .rc_key_map_size  = ARRAY_SIZE(ir_codes_cinergyt2_table),
+               .rc_map_table     = rc_map_cinergyt2_table,
+               .rc_map_size      = ARRAY_SIZE(rc_map_cinergyt2_table),
                .rc_query         = cinergyt2_rc_query,
        },