ARM: tegra: suspend: protect suspend functions with CONFIG_PM
authorAllen Martin <AMartin@nvidia.com>
Fri, 19 Nov 2010 23:51:50 +0000 (15:51 -0800)
committerColin Cross <ccross@android.com>
Thu, 25 Nov 2010 00:28:34 +0000 (16:28 -0800)
Protect suspend/resume functions behind #ifdef CONFIG_PM.  This
prevents a compile error with CONFIG_PM turned off.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
arch/arm/mach-tegra/suspend.c

index f691e906eb0e7cab261b3fa2ac50df68f7538d2d..ead053e3acf4af3e77d29787e384964fc97fe565 100644 (file)
@@ -79,10 +79,12 @@ struct suspend_context {
 volatile struct suspend_context tegra_sctx;
 
 static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
+#ifdef CONFIG_PM
 static void __iomem *clk_rst = IO_ADDRESS(TEGRA_CLK_RESET_BASE);
 static void __iomem *flow_ctrl = IO_ADDRESS(TEGRA_FLOW_CTRL_BASE);
 static void __iomem *evp_reset = IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE)+0x100;
 static void __iomem *tmrus = IO_ADDRESS(TEGRA_TMRUS_BASE);
+#endif
 
 #define PMC_CTRL               0x0
 #define PMC_CTRL_LATCH_WAKEUPS (1 << 5)
@@ -251,6 +253,7 @@ static int create_suspend_pgtable(void)
 
 
 
+#ifdef CONFIG_PM
 /*
  * suspend_cpu_complex
  *
@@ -387,8 +390,6 @@ unsigned int tegra_suspend_lp2(unsigned int us)
        return remain;
 }
 
-#ifdef CONFIG_PM
-
 /* ensures that sufficient time is passed for a register write to
  * serialize into the 32KHz domain */
 static void pmc_32kwritel(u32 val, unsigned long offs)