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

[pandora-kernel.git] / drivers / media / platform / exynos4-is / mipi-csis.c

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index db6fd14..9e1056d 100644 (file)
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -238,34 +238,34 @@ struct csis_state {
  */
 struct csis_pix_format {
        unsigned int pix_width_alignment;
-       enum v4l2_mbus_pixelcode code;
+       u32 code;
        u32 fmt_reg;
        u8 data_alignment;
 };
 
 static const struct csis_pix_format s5pcsis_formats[] = {
        {
-               .code = V4L2_MBUS_FMT_VYUY8_2X8,
+               .code = MEDIA_BUS_FMT_VYUY8_2X8,
                .fmt_reg = S5PCSIS_CFG_FMT_YCBCR422_8BIT,
                .data_alignment = 32,
        }, {
-               .code = V4L2_MBUS_FMT_JPEG_1X8,
+               .code = MEDIA_BUS_FMT_JPEG_1X8,
                .fmt_reg = S5PCSIS_CFG_FMT_USER(1),
                .data_alignment = 32,
        }, {
-               .code = V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8,
+               .code = MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,
                .fmt_reg = S5PCSIS_CFG_FMT_USER(1),
                .data_alignment = 32,
        }, {
-               .code = V4L2_MBUS_FMT_SGRBG8_1X8,
+               .code = MEDIA_BUS_FMT_SGRBG8_1X8,
                .fmt_reg = S5PCSIS_CFG_FMT_RAW8,
                .data_alignment = 24,
        }, {
-               .code = V4L2_MBUS_FMT_SGRBG10_1X10,
+               .code = MEDIA_BUS_FMT_SGRBG10_1X10,
                .fmt_reg = S5PCSIS_CFG_FMT_RAW10,
                .data_alignment = 24,
        }, {
-               .code = V4L2_MBUS_FMT_SGRBG12_1X12,
+               .code = MEDIA_BUS_FMT_SGRBG12_1X12,
                .fmt_reg = S5PCSIS_CFG_FMT_RAW12,
                .data_alignment = 24,
        }
@@ -978,7 +978,7 @@ static int s5pcsis_resume(struct device *dev)
 }
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int s5pcsis_runtime_suspend(struct device *dev)
 {
        return s5pcsis_pm_suspend(dev, true);