Skip to content

Commit

Permalink
OMAP3: PM: Do not build suspend code if SUSPEND is not enabled
Browse files Browse the repository at this point in the history
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Kevin Hilman committed Aug 5, 2009
1 parent 040fed0 commit 10f90ed
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
struct power_state {
struct powerdomain *pwrdm;
u32 next_state;
#ifdef CONFIG_SUSPEND
u32 saved_state;
#endif
struct list_head node;
};

Expand Down Expand Up @@ -293,6 +295,7 @@ static void omap3_pm_idle(void)
local_irq_enable();
}

#ifdef CONFIG_SUSPEND
static int omap3_pm_prepare(void)
{
disable_hlt();
Expand Down Expand Up @@ -366,6 +369,7 @@ static struct platform_suspend_ops omap_pm_ops = {
.finish = omap3_pm_finish,
.valid = suspend_valid_only_mem,
};
#endif /* CONFIG_SUSPEND */


/**
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 10f90ed

Please sign in to comment.