diff options
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 6 |
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 @@ | |||
| 39 | struct power_state { | 39 | struct 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 | ||
| 296 | static int omap3_pm_prepare(void) | 299 | static 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 | ||
