Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index e826077094fa..13d006bb19db 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -161,7 +161,7 @@ static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static struct dvb_usb_rc_key ir_codes_digitv_table[] = {
+static struct ir_scancode ir_codes_digitv_table[] = {
         { 0x5f55, KEY_0 },
         { 0x6f55, KEY_1 },
         { 0x9f55, KEY_2 },
@@ -237,10 +237,10 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         /* if something is inside the buffer, simulate key press */
         if (key[1] != 0)
         {
-                  for (i = 0; i < d->props.rc_key_map_size; i++) {
-                        if (rc5_custom(&d->props.rc_key_map[i]) == key[1] &&
-                            rc5_data(&d->props.rc_key_map[i]) == key[2]) {
-                                *event = d->props.rc_key_map[i].event;
+                  for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
+                        if (rc5_custom(&d->props.rc.legacy.rc_key_map[i]) == key[1] &&
+                            rc5_data(&d->props.rc.legacy.rc_key_map[i]) == key[2]) {
+                                *event = d->props.rc.legacy.rc_key_map[i].keycode;
                                 *state = REMOTE_KEY_PRESSED;
                                 return 0;
                         }
@@ -310,10 +310,12 @@ static struct dvb_usb_device_properties digitv_properties = {
         },
         .identify_state   = digitv_identify_state,
 
-        .rc_interval      = 1000,
-        .rc_key_map       = ir_codes_digitv_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_digitv_table),
-        .rc_query         = digitv_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 1000,
+                .rc_key_map       = ir_codes_digitv_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_digitv_table),
+                .rc_query         = digitv_rc_query,
+        },
 
         .i2c_algo         = &digitv_i2c_algo,