diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2014-04-15 14:34:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 15:49:39 -0300 |
| commit | f486e7c3cb9849b6a661931fa8c51a43d477046b (patch) | |
| tree | aee1868b53147e0217ab18c0e8411732898e1575 /drivers/media/platform/exynos4-is | |
| parent | 3e594ce7ea98ed4f4a52333e968ff7eca135737a (diff) | |
| download | op-kernel-dev-f486e7c3cb9849b6a661931fa8c51a43d477046b.zip op-kernel-dev-f486e7c3cb9849b6a661931fa8c51a43d477046b.tar.gz | |
[media] exynos4-is: Fix compilation for !CONFIG_COMMON_CLK
CONFIG_COMMON_CLK is not enabled on S5PV210 platform, so include
some clk API data structures conditionally to avoid compilation
errors. These #ifdefs will be removed for next kernel release,
when the S5PV210 platform moves to DT and the common clk API.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: stable@vger.kernel.org # for 3.15
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is')
| -rw-r--r-- | drivers/media/platform/exynos4-is/media-dev.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/exynos4-is/media-dev.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index e62211a..6e2d604 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -1520,7 +1520,7 @@ err: } #else #define fimc_md_register_clk_provider(fmd) (0) -#define fimc_md_unregister_clk_provider(fmd) (0) +#define fimc_md_unregister_clk_provider(fmd) #endif static int subdev_notifier_bound(struct v4l2_async_notifier *notifier, diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h index ee1e251..58c4945 100644 --- a/drivers/media/platform/exynos4-is/media-dev.h +++ b/drivers/media/platform/exynos4-is/media-dev.h @@ -94,7 +94,9 @@ struct fimc_sensor_info { }; struct cam_clk { +#ifdef CONFIG_COMMON_CLK struct clk_hw hw; +#endif struct fimc_md *fmd; }; #define to_cam_clk(_hw) container_of(_hw, struct cam_clk, hw) @@ -142,7 +144,9 @@ struct fimc_md { struct cam_clk_provider { struct clk *clks[FIMC_MAX_CAMCLKS]; +#ifdef CONFIG_COMMON_CLK struct clk_onecell_data clk_data; +#endif struct device_node *of_node; struct cam_clk camclk[FIMC_MAX_CAMCLKS]; int num_clocks; |
