diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-06-24 11:39:18 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-08-05 09:10:52 -0700 |
| commit | 10f90ed2d727c0f344d910c02c9726d0481d9b00 (patch) | |
| tree | e33c27682bc8f64f2fd4855c47732ada28213382 /arch/arm | |
| parent | 040fed059c34da5115790609f1a038fc9aec88d1 (diff) | |
| download | kernel_samsung_crespo-10f90ed2d727c0f344d910c02c9726d0481d9b00.zip kernel_samsung_crespo-10f90ed2d727c0f344d910c02c9726d0481d9b00.tar.gz kernel_samsung_crespo-10f90ed2d727c0f344d910c02c9726d0481d9b00.tar.bz2 | |
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/arm')
| -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 c813a08..528f725 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -39,7 +39,9 @@ struct power_state { struct powerdomain *pwrdm; u32 next_state; +#ifdef CONFIG_SUSPEND u32 saved_state; +#endif struct list_head node; }; @@ -293,6 +295,7 @@ out: local_irq_enable(); } +#ifdef CONFIG_SUSPEND static int omap3_pm_prepare(void) { disable_hlt(); @@ -366,6 +369,7 @@ static struct platform_suspend_ops omap_pm_ops = { .finish = omap3_pm_finish, .valid = suspend_valid_only_mem, }; +#endif /* CONFIG_SUSPEND */ /** @@ -710,7 +714,9 @@ static int __init omap3_pm_init(void) _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend, omap34xx_cpu_suspend_sz); +#ifdef CONFIG_SUSPEND suspend_set_ops(&omap_pm_ops); +#endif /* CONFIG_SUSPEND */ pm_idle = omap3_pm_idle; |