Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / media / platform / exynos4-is / fimc-core.c

diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index f5d8552..2acc195 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -81,7 +81,7 @@ static struct fimc_fmt fimc_formats[] = {
                .flags          = FMT_FLAGS_M2M_OUT | FMT_HAS_ALPHA,
        }, {
                .name           = "YUV 4:4:4",
-               .mbus_code      = V4L2_MBUS_FMT_YUV10_1X30,
+               .mbus_code      = MEDIA_BUS_FMT_YUV10_1X30,
                .flags          = FMT_FLAGS_WRITEBACK,
        }, {
                .name           = "YUV 4:2:2 packed, YCbYCr",
@@ -90,7 +90,7 @@ static struct fimc_fmt fimc_formats[] = {
                .color          = FIMC_FMT_YCBYCR422,
                .memplanes      = 1,
                .colplanes      = 1,
-               .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+               .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
        }, {
                .name           = "YUV 4:2:2 packed, CbYCrY",
@@ -99,7 +99,7 @@ static struct fimc_fmt fimc_formats[] = {
                .color          = FIMC_FMT_CBYCRY422,
                .memplanes      = 1,
                .colplanes      = 1,
-               .mbus_code      = V4L2_MBUS_FMT_UYVY8_2X8,
+               .mbus_code      = MEDIA_BUS_FMT_UYVY8_2X8,
                .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
        }, {
                .name           = "YUV 4:2:2 packed, CrYCbY",
@@ -108,7 +108,7 @@ static struct fimc_fmt fimc_formats[] = {
                .color          = FIMC_FMT_CRYCBY422,
                .memplanes      = 1,
                .colplanes      = 1,
-               .mbus_code      = V4L2_MBUS_FMT_VYUY8_2X8,
+               .mbus_code      = MEDIA_BUS_FMT_VYUY8_2X8,
                .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
        }, {
                .name           = "YUV 4:2:2 packed, YCrYCb",
@@ -117,7 +117,7 @@ static struct fimc_fmt fimc_formats[] = {
                .color          = FIMC_FMT_YCRYCB422,
                .memplanes      = 1,
                .colplanes      = 1,
-               .mbus_code      = V4L2_MBUS_FMT_YVYU8_2X8,
+               .mbus_code      = MEDIA_BUS_FMT_YVYU8_2X8,
                .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
        }, {
                .name           = "YUV 4:2:2 planar, Y/Cb/Cr",
@@ -190,7 +190,7 @@ static struct fimc_fmt fimc_formats[] = {
                .depth          = { 8 },
                .memplanes      = 1,
                .colplanes      = 1,
-               .mbus_code      = V4L2_MBUS_FMT_JPEG_1X8,
+               .mbus_code      = MEDIA_BUS_FMT_JPEG_1X8,
                .flags          = FMT_FLAGS_CAM | FMT_FLAGS_COMPRESSED,
        }, {
                .name           = "S5C73MX interleaved UYVY/JPEG",
@@ -200,7 +200,7 @@ static struct fimc_fmt fimc_formats[] = {
                .memplanes      = 2,
                .colplanes      = 1,
                .mdataplanes    = 0x2, /* plane 1 holds frame meta data */
-               .mbus_code      = V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8,
+               .mbus_code      = MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,
                .flags          = FMT_FLAGS_CAM | FMT_FLAGS_COMPRESSED,
        },
 };