From a850c427029e5b9953fe4d4fe4fef10a61ee165a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 21 Nov 2014 11:48:54 +0100 Subject: ARM: common: edma: edma_pm_resume may be unused The recently introduced resume hook in the edma driver is not referenced when CONFIG_PM_SLEEP is not set, which results in a compile warning in keystone builds. This adds an appropriate #ifdef. Cc: Nishanth Menon Cc: Daniel Mack Cc: Joel Fernandes Acked-by: Sekhar Nori Fixes: a2b1175131: ("ARM: common: edma: add suspend resume hook") Signed-off-by: Arnd Bergmann --- arch/arm/common/edma.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/common/edma.c') diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 79de6a23047b..e093f2fcee7a 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -1801,6 +1801,7 @@ static int edma_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP static int edma_pm_resume(struct device *dev) { int i, j; @@ -1840,6 +1841,7 @@ static int edma_pm_resume(struct device *dev) return 0; } +#endif static const struct dev_pm_ops edma_pm_ops = { SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, edma_pm_resume) -- cgit v1.2.3