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

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / s5p-tv / hdmi_drv.c

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 2b959ae4e62f26c94a5ed024589f2824cbc239e5..0e74aabf5f9a6eeb7226420d8ab8437c55782d06 100644 (file)
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -660,7 +660,7 @@ static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd,
        memset(fmt, 0, sizeof(*fmt));
        fmt->width = t->hact.end - t->hact.beg;
        fmt->height = t->vact[0].end - t->vact[0].beg;
-       fmt->code = V4L2_MBUS_FMT_FIXED; /* means RGB888 */
+       fmt->code = MEDIA_BUS_FMT_FIXED; /* means RGB888 */
        fmt->colorspace = V4L2_COLORSPACE_SRGB;
        if (t->interlaced) {
                fmt->field = V4L2_FIELD_INTERLACED;