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 / dtt200u.c

diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index ca495e07f35c55041d190c3912b4efa447f964a7..ecd86eca2548099cbb22413ea52d170924cab110 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -57,7 +57,7 @@ static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
 
 /* remote control */
 /* key list for the tiny remote control (Yakumo, don't know about the others) */
-static struct ir_scancode ir_codes_dtt200u_table[] = {
+static struct rc_map_table rc_map_dtt200u_table[] = {
        { 0x8001, KEY_MUTE },
        { 0x8002, KEY_CHANNELDOWN },
        { 0x8003, KEY_VOLUMEDOWN },
@@ -163,8 +163,8 @@ static struct dvb_usb_device_properties dtt200u_properties = {
 
        .rc.legacy = {
                .rc_interval     = 300,
-               .rc_key_map      = ir_codes_dtt200u_table,
-               .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+               .rc_map_table    = rc_map_dtt200u_table,
+               .rc_map_size     = ARRAY_SIZE(rc_map_dtt200u_table),
                .rc_query        = dtt200u_rc_query,
        },
 
@@ -210,8 +210,8 @@ static struct dvb_usb_device_properties wt220u_properties = {
 
        .rc.legacy = {
                .rc_interval     = 300,
-               .rc_key_map      = ir_codes_dtt200u_table,
-               .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+               .rc_map_table      = rc_map_dtt200u_table,
+               .rc_map_size = ARRAY_SIZE(rc_map_dtt200u_table),
                .rc_query        = dtt200u_rc_query,
        },
 
@@ -257,8 +257,8 @@ static struct dvb_usb_device_properties wt220u_fc_properties = {
 
        .rc.legacy = {
                .rc_interval     = 300,
-               .rc_key_map      = ir_codes_dtt200u_table,
-               .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+               .rc_map_table    = rc_map_dtt200u_table,
+               .rc_map_size     = ARRAY_SIZE(rc_map_dtt200u_table),
                .rc_query        = dtt200u_rc_query,
        },
 
@@ -304,8 +304,8 @@ static struct dvb_usb_device_properties wt220u_zl0353_properties = {
 
        .rc.legacy = {
                .rc_interval     = 300,
-               .rc_key_map      = ir_codes_dtt200u_table,
-               .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+               .rc_map_table    = rc_map_dtt200u_table,
+               .rc_map_size     = ARRAY_SIZE(rc_map_dtt200u_table),
                .rc_query        = dtt200u_rc_query,
        },