Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

[deliverable/linux.git] / arch / arm / mach-exynos / clock.c

diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 5a8c42e90005c6fb3a92599671afefed6909fda3..200874e82dcda99dc25d5b4313a7e16baaa67472 100644 (file)
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -30,6 +30,7 @@
 
 #include "common.h"
 
+#ifdef CONFIG_PM_SLEEP
 static struct sleep_save exynos4_clock_save[] = {
        SAVE_ITEM(S5P_CLKDIV_LEFTBUS),
        SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS),
@@ -93,6 +94,7 @@ static struct sleep_save exynos4_clock_save[] = {
        SAVE_ITEM(S5P_CLKGATE_SCLKCPU),
        SAVE_ITEM(S5P_CLKGATE_IP_CPU),
 };
+#endif
 
 struct clk clk_sclk_hdmi27m = {
        .name           = "sclk_hdmi27m",
@@ -1524,7 +1526,7 @@ static void exynos4_clock_resume(void)
 #define exynos4_clock_resume NULL
 #endif
 
-struct syscore_ops exynos4_clock_syscore_ops = {
+static struct syscore_ops exynos4_clock_syscore_ops = {
        .suspend        = exynos4_clock_suspend,
        .resume         = exynos4_clock_resume,
 };