---

yaml --- r: 226673 b: refs/heads/master c: 05fad3e h: refs/heads/master i: 226671: fbd3e04 v: v3
git-mirror · Dec 22, 2010 · 45d7d30 · 45d7d30
1 parent 93b3a2a
commit 45d7d30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c4655651f1377297425525b250b2e4b5462015b
+refs/heads/master: 05fad3e72e98e57274b8930a08f8b476048f5022
diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c
@@ -299,6 +299,7 @@ static void omap2_pm_idle(void)
 	local_irq_enable();
 }
 
+#ifdef CONFIG_SUSPEND
 static int omap2_pm_begin(suspend_state_t state)
 {
 	disable_hlt();
@@ -355,6 +356,9 @@ static struct platform_suspend_ops omap_pm_ops = {
 	.end		= omap2_pm_end,
 	.valid		= suspend_valid_only_mem,
 };
+#else
+static const struct platform_suspend_ops __initdata omap_pm_ops;
+#endif /* CONFIG_SUSPEND */
 
 /* XXX This function should be shareable between OMAP2xxx and OMAP3 */
 static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)