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

2 files changed, 5 insertions, 15 deletions

diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 33fde2a763ec..6c74b05d1f95 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -367,7 +367,7 @@ static int mxr_g_selection(struct file *file, void *fh,
                 return -EINVAL;
 
         switch (s->target) {
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
                 s->r.left = geo->src.x_offset;
                 s->r.top = geo->src.y_offset;
                 s->r.width = geo->src.width;
@@ -380,7 +380,7 @@ static int mxr_g_selection(struct file *file, void *fh,
                 s->r.width = geo->src.full_width;
                 s->r.height = geo->src.full_height;
                 break;
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_PADDED:
                 s->r.left = geo->dst.x_offset;
                 s->r.top = geo->dst.y_offset;
@@ -449,11 +449,11 @@ static int mxr_s_selection(struct file *file, void *fh,
                 res.height = geo->dst.full_height;
                 break;
 
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
                 target = &geo->src;
                 stage = MXR_GEOMETRY_CROP;
                 break;
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_PADDED:
                 target = &geo->dst;
                 stage = MXR_GEOMETRY_COMPOSE;
diff --git a/drivers/media/video/s5p-tv/sii9234_drv.c b/drivers/media/video/s5p-tv/sii9234_drv.c
index 0f31eccd7b80..6d348f90237a 100644
--- a/drivers/media/video/s5p-tv/sii9234_drv.c
+++ b/drivers/media/video/s5p-tv/sii9234_drv.c
@@ -419,14 +419,4 @@ static struct i2c_driver sii9234_driver = {
         .id_table = sii9234_id,
 };
 
-static int __init sii9234_init(void)
-{
-        return i2c_add_driver(&sii9234_driver);
-}
-module_init(sii9234_init);
-
-static void __exit sii9234_exit(void)
-{
-        i2c_del_driver(&sii9234_driver);
-}
-module_exit(sii9234_exit);
+module_i2c_driver(sii9234_driver);