Fix pm24xx.c compilation problem

Charles Manning
2010-12-22T20:19:30Z

arch/arm/mach-omap2/pm24xx.c doesn't compile without CONFIG_SUSPEND

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index aaeea49..ae6abda 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -53,8 +53,8 @@
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>

-#ifdef CONFIG_SUSPEND
static suspend_state_t suspend_state = PM_SUSPEND_ON;
+#ifdef CONFIG_SUSPEND
static inline bool is_suspending(void)
{
return (suspend_state != PM_SUSPEND_ON);
@@ -314,6 +314,7 @@ static int omap2_pm_prepare(void)

static int omap2_pm_suspend(void)
{
+#ifdef CONFIG_SUSPEND
u32 wken_wkup, mir1;

wken_wkup = prm_read_mod_reg(WKUP_MOD, PM_WKEN);
@@ -329,7 +330,7 @@ static int omap2_pm_suspend(void)

omap_writel(mir1, 0x480fe0a4);
prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN);
-
+#endif
return 0;
}