diff options
| author | Allen Martin <AMartin@nvidia.com> | 2010-11-19 15:51:50 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-11-24 16:28:34 -0800 |
| commit | febad2cd1e18846e1f4b28cbe996c43e7b6b899e (patch) | |
| tree | 7b833df755af8f0c6e098a36f20559114e155a40 /arch/arm/mach-tegra/suspend.c | |
| parent | 287241377fa85a0ae29efa02c94851ab2ae50127 (diff) | |
ARM: tegra: suspend: protect suspend functions with CONFIG_PM
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>
Diffstat (limited to 'arch/arm/mach-tegra/suspend.c')
| -rw-r--r-- | arch/arm/mach-tegra/suspend.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c index f691e906eb0e..ead053e3acf4 100644 --- a/arch/arm/mach-tegra/suspend.c +++ b/arch/arm/mach-tegra/suspend.c @@ -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) |