Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / media / i2c / saa6752hs.c

diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 4024ea6..f14c0e6 100644 (file)
--- a/drivers/media/i2c/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
@@ -562,7 +562,7 @@ static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
                h->video_format = SAA6752HS_VF_D1;
        f->width = v4l2_format_table[h->video_format].fmt.pix.width;
        f->height = v4l2_format_table[h->video_format].fmt.pix.height;
-       f->code = V4L2_MBUS_FMT_FIXED;
+       f->code = MEDIA_BUS_FMT_FIXED;
        f->field = V4L2_FIELD_INTERLACED;
        f->colorspace = V4L2_COLORSPACE_SMPTE170M;
        return 0;
@@ -572,7 +572,7 @@ static int saa6752hs_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_frame
 {
        int dist_352, dist_480, dist_720;
 
-       f->code = V4L2_MBUS_FMT_FIXED;
+       f->code = MEDIA_BUS_FMT_FIXED;
 
        dist_352 = abs(f->width - 352);
        dist_480 = abs(f->width - 480);
@@ -599,7 +599,7 @@ static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
 {
        struct saa6752hs_state *h = to_state(sd);
 
-       if (f->code != V4L2_MBUS_FMT_FIXED)
+       if (f->code != MEDIA_BUS_FMT_FIXED)
                return -EINVAL;
 
        /*