Merge branch 'patches_for_v3.6' into v4l_for_linus

* patches_for_v3.6: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index dd91da26f1b0..53f5a703e31a 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -1949,7 +1949,7 @@ static int preview_get_selection(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         switch (sel->target) {
-        case V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS:
+        case V4L2_SEL_TGT_CROP_BOUNDS:
                 sel->r.left = 0;
                 sel->r.top = 0;
                 sel->r.width = INT_MAX;
@@ -1960,7 +1960,7 @@ static int preview_get_selection(struct v4l2_subdev *sd,
                 preview_try_crop(prev, format, &sel->r);
                 break;
 
-        case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL:
+        case V4L2_SEL_TGT_CROP:
                 sel->r = *__preview_get_crop(prev, fh, sel->which);
                 break;
 
@@ -1988,7 +1988,7 @@ static int preview_set_selection(struct v4l2_subdev *sd,
         struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
         struct v4l2_mbus_framefmt *format;
 
-        if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL ||
+        if (sel->target != V4L2_SEL_TGT_CROP ||
             sel->pad != PREV_PAD_SINK)
                 return -EINVAL;
 
@@ -2000,7 +2000,7 @@ static int preview_set_selection(struct v4l2_subdev *sd,
          * pad. If the KEEP_CONFIG flag is set, just return the current crop
          * rectangle.
          */
-        if (sel->flags & V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG) {
+        if (sel->flags & V4L2_SEL_FLAG_KEEP_CONFIG) {
                 sel->r = *__preview_get_crop(prev, fh, sel->which);
                 return 0;
         }