Merge branch 'v4l_for_linus' into patchwork

[karo-tx-linux.git] / drivers / media / platform / exynos4-is / fimc-is.h

diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h
index 4b0eccb68480a97755b72453d8c17a5005ac0c66..08fa518c34f754030aca4fb3afe0a5b5f195eae6 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.h
+++ b/drivers/media/platform/exynos4-is/fimc-is.h
@@ -263,7 +263,6 @@ struct fimc_is {
        spinlock_t                      slock;
 
        struct clk                      *clocks[ISS_CLKS_MAX];
-       bool                            clk_init;
        void __iomem                    *regs;
        void __iomem                    *pmu_regs;
        int                             irq;