Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / media / platform / s5p-tv / sdo_drv.c

diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index 0dfe51a9ca067caa581b1cc4f4a501e8f9073b3f..3621af91d4609225256c9ac65ee4dccd43fa0dcc 100644 (file)
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -170,7 +170,7 @@ static int sdo_g_mbus_fmt(struct v4l2_subdev *sd,
        /* all modes are 720 pixels wide */
        fmt->width = 720;
        fmt->height = sdev->fmt->height;
-       fmt->code = V4L2_MBUS_FMT_FIXED;
+       fmt->code = MEDIA_BUS_FMT_FIXED;
        fmt->field = V4L2_FIELD_INTERLACED;
        fmt->colorspace = V4L2_COLORSPACE_JPEG;
        return 0;