aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2009-06-24 14:39:18 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-08-05 12:10:52 -0400
commit10f90ed2d727c0f344d910c02c9726d0481d9b00 (patch)
treee33c27682bc8f64f2fd4855c47732ada28213382 /arch
parent040fed059c34da5115790609f1a038fc9aec88d1 (diff)
OMAP3: PM: Do not build suspend code if SUSPEND is not enabled
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index c813a081c3c8..528f725722a2 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -39,7 +39,9 @@
39struct power_state { 39struct power_state {
40 struct powerdomain *pwrdm; 40 struct powerdomain *pwrdm;
41 u32 next_state; 41 u32 next_state;
42#ifdef CONFIG_SUSPEND
42 u32 saved_state; 43 u32 saved_state;
44#endif
43 struct list_head node; 45 struct list_head node;
44}; 46};
45 47
@@ -293,6 +295,7 @@ out:
293 local_irq_enable(); 295 local_irq_enable();
294} 296}
295 297
298#ifdef CONFIG_SUSPEND
296static int omap3_pm_prepare(void) 299static int omap3_pm_prepare(void)
297{ 300{
298 disable_hlt(); 301 disable_hlt();
@@ -366,6 +369,7 @@ static struct platform_suspend_ops omap_pm_ops = {
366 .finish = omap3_pm_finish, 369 .finish = omap3_pm_finish,
367 .valid = suspend_valid_only_mem, 370 .valid = suspend_valid_only_mem,
368}; 371};
372#endif /* CONFIG_SUSPEND */
369 373
370 374
371/** 375/**
@@ -710,7 +714,9 @@ static int __init omap3_pm_init(void)
710 _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend, 714 _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend,
711 omap34xx_cpu_suspend_sz); 715 omap34xx_cpu_suspend_sz);
712 716
717#ifdef CONFIG_SUSPEND
713 suspend_set_ops(&omap_pm_ops); 718 suspend_set_ops(&omap_pm_ops);
719#endif /* CONFIG_SUSPEND */
714 720
715 pm_idle = omap3_pm_idle; 721 pm_idle = omap3_pm_idle;
716 722