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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 8 insertions, 14 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 31c0a0ed39f5..8671ca362c81 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1041,13 +1041,13 @@ static int af9015_rc_query(struct dvb_usb_device *d)
                                 priv->rc_keycode = buf[12] << 16 |
                                         buf[13] << 8 | buf[14];
                         }
-                        ir_keydown(d->rc_input_dev, priv->rc_keycode, 0);
+                        rc_keydown(d->rc_dev, priv->rc_keycode, 0);
                 } else {
                         priv->rc_keycode = 0; /* clear just for sure */
                 }
         } else if (priv->rc_repeat != buf[6] || buf[0]) {
                 deb_rc("%s: key repeated\n", __func__);
-                ir_keydown(d->rc_input_dev, priv->rc_keycode, 0);
+                rc_keydown(d->rc_dev, priv->rc_keycode, 0);
         } else {
                 deb_rc("%s: no key press\n", __func__);
         }
@@ -1344,13 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1474,13 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1588,13 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,