summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding2014-10-14 12:11:18 +0200
committerMauro Carvalho Chehab2014-10-24 13:36:38 +0200
commitd3460b2abab3800e2d33d5529f8a54bd2e45b4e0 (patch)
tree2133e25bbe8213cd085ed2aac0c109c075de719e
parent[media] s5p-jpeg: Only build suspend/resume for PM (diff)
downloadkernel-qcow2-linux-d3460b2abab3800e2d33d5529f8a54bd2e45b4e0.tar.gz
kernel-qcow2-linux-d3460b2abab3800e2d33d5529f8a54bd2e45b4e0.tar.xz
kernel-qcow2-linux-d3460b2abab3800e2d33d5529f8a54bd2e45b4e0.zip
[media] s5p-fimc: Only build suspend/resume for PM
If power management is disabled these functions become unused, so there is no reason to build them. This fixes a couple of build warnings when PM(_SLEEP,_RUNTIME) is not enabled. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/platform/exynos4-is/fimc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index b70fd996d794..aee92d908e49 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -832,6 +832,7 @@ err:
return -ENXIO;
}
+#if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
static int fimc_m2m_suspend(struct fimc_dev *fimc)
{
unsigned long flags;
@@ -870,6 +871,7 @@ static int fimc_m2m_resume(struct fimc_dev *fimc)
return 0;
}
+#endif /* CONFIG_PM_RUNTIME || CONFIG_PM_SLEEP */
static const struct of_device_id fimc_of_match[];