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-mb.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 8e3c0d2cce161b235b02fff433a287eca78fe0f4..04d91bdd35629b282d0aa1b68b9e3941808b7368 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -213,8 +213,8 @@ static struct dvb_usb_device_properties dibusb1_1_properties = {
 
        .rc.legacy = {
                .rc_interval      = DEFAULT_RC_INTERVAL,
-               .rc_key_map       = ir_codes_dibusb_table,
-               .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+               .rc_map_table     = rc_map_dibusb_table,
+               .rc_map_size      = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
                .rc_query         = dibusb_rc_query,
        },
 
@@ -299,8 +299,8 @@ static struct dvb_usb_device_properties dibusb1_1_an2235_properties = {
 
        .rc.legacy = {
                .rc_interval      = DEFAULT_RC_INTERVAL,
-               .rc_key_map       = ir_codes_dibusb_table,
-               .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+               .rc_map_table     = rc_map_dibusb_table,
+               .rc_map_size      = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
                .rc_query         = dibusb_rc_query,
        },
 
@@ -365,8 +365,8 @@ static struct dvb_usb_device_properties dibusb2_0b_properties = {
 
        .rc.legacy = {
                .rc_interval      = DEFAULT_RC_INTERVAL,
-               .rc_key_map       = ir_codes_dibusb_table,
-               .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+               .rc_map_table     = rc_map_dibusb_table,
+               .rc_map_size      = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
                .rc_query         = dibusb_rc_query,
        },
 
@@ -424,8 +424,8 @@ static struct dvb_usb_device_properties artec_t1_usb2_properties = {
 
        .rc.legacy = {
                .rc_interval      = DEFAULT_RC_INTERVAL,
-               .rc_key_map       = ir_codes_dibusb_table,
-               .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+               .rc_map_table     = rc_map_dibusb_table,
+               .rc_map_size      = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
                .rc_query         = dibusb_rc_query,
        },