aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm24xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
-rw-r--r--arch/arm/mach-omap2/pm24xx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 2844b84f8d46..dac2d1d9987d 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -299,6 +299,7 @@ out:
299 local_irq_enable(); 299 local_irq_enable();
300} 300}
301 301
302#ifdef CONFIG_SUSPEND
302static int omap2_pm_begin(suspend_state_t state) 303static int omap2_pm_begin(suspend_state_t state)
303{ 304{
304 disable_hlt(); 305 disable_hlt();
@@ -355,6 +356,9 @@ static struct platform_suspend_ops omap_pm_ops = {
355 .end = omap2_pm_end, 356 .end = omap2_pm_end,
356 .valid = suspend_valid_only_mem, 357 .valid = suspend_valid_only_mem,
357}; 358};
359#else
360static const struct platform_suspend_ops __initdata omap_pm_ops;
361#endif /* CONFIG_SUSPEND */
358 362
359/* XXX This function should be shareable between OMAP2xxx and OMAP3 */ 363/* XXX This function should be shareable between OMAP2xxx and OMAP3 */
360static int __init clkdms_setup(struct clockdomain *clkdm, void *unused) 364static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)