From 45d7d30d7e0acce36259d487026a0a41024f8510 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Wed, 22 Dec 2010 23:04:17 +0000
Subject: [PATCH] --- yaml --- r: 226673 b: refs/heads/master c:
 05fad3e72e98e57274b8930a08f8b476048f5022 h: refs/heads/master i:   226671:
 fbd3e04781b130165302a27d87e1776c7a73df22 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-omap2/pm24xx.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1cfae2421dba..bd4480c2e1ae 100644
--- 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
index 2844b84f8d46..dac2d1d9987d 100644
--- 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)