summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-01-23 15:55:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 16:37:00 -0800
commit11ba5a1eeb5406c58ffda0fc07360b2ef5c4f176 (patch)
treed1974a716a66bb036aee7471dc5a7ea28b59bec7
parent75ea799df4cb07e505c91b4abaa87bc28aad3e66 (diff)
downloadkernel-common-11ba5a1eeb5406c58ffda0fc07360b2ef5c4f176.tar.gz
kernel-common-11ba5a1eeb5406c58ffda0fc07360b2ef5c4f176.tar.bz2
kernel-common-11ba5a1eeb5406c58ffda0fc07360b2ef5c4f176.zip
drivers/rtc/rtc-s5m.c: s5m_rtc_{suspend,resume}() should depend on CONFIG_PM_SLEEP
If CONFIG_PM_SLEEP=n: drivers/rtc/rtc-s5m.c:643: warning: `s5m_rtc_resume' defined but not used drivers/rtc/rtc-s5m.c:654: warning: `s5m_rtc_suspend' defined but not used Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-s5m.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index ae8119dc2846..476af93543f6 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -639,6 +639,7 @@ static void s5m_rtc_shutdown(struct platform_device *pdev)
s5m_rtc_enable_smpl(info, false);
}
+#ifdef CONFIG_PM_SLEEP
static int s5m_rtc_resume(struct device *dev)
{
struct s5m_rtc_info *info = dev_get_drvdata(dev);
@@ -660,6 +661,7 @@ static int s5m_rtc_suspend(struct device *dev)
return ret;
}
+#endif /* CONFIG_PM_SLEEP */
static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);