From e68c7f1deaefb3cf125bb0f92de7051eb1911460 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 7 Apr 2012 00:53:21 +0300
Subject: [PATCH] --- yaml --- r: 299487 b: refs/heads/master c:
 63878acfafbc7a6ff90a2f8b3e31f0889bc61af6 h: refs/heads/master i:   299485:
 988daf0c362d088c74e02762534a4082f3fb1dd2   299483:
 ccc7bc0f2625ac129669d3d6fee652bd6ebe1450   299479:
 4bf3835cfa1506fa2458cf4cb9fb3d43a7473a12   299471:
 cfd88975a63c4565db3724d4dce0cc4cf8d93f1c   299455:
 c7c5ec119a57db5266cb48fd820a94d07131df60 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/plat-omap/sram.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8ef0b5824c1d..6b65eda006a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 907025e3bae0e9e96361dab5b157383cbfbafda0
+refs/heads/master: 63878acfafbc7a6ff90a2f8b3e31f0889bc61af6
diff --git a/trunk/arch/arm/plat-omap/sram.c b/trunk/arch/arm/plat-omap/sram.c
index eec98afa0f83..f9a8c5341ee9 100644
--- a/trunk/arch/arm/plat-omap/sram.c
+++ b/trunk/arch/arm/plat-omap/sram.c
@@ -348,7 +348,6 @@ u32 omap3_configure_core_dpll(u32 m2, u32 unlock_dll, u32 f, u32 inc,
 			sdrc_actim_ctrl_b_1, sdrc_mr_1);
 }
 
-#ifdef CONFIG_PM
 void omap3_sram_restore_context(void)
 {
 	omap_sram_ceil = omap_sram_base + omap_sram_size;
@@ -358,17 +357,18 @@ void omap3_sram_restore_context(void)
 			       omap3_sram_configure_core_dpll_sz);
 	omap_push_sram_idle();
 }
-#endif /* CONFIG_PM */
-
-#endif /* CONFIG_ARCH_OMAP3 */
 
 static inline int omap34xx_sram_init(void)
 {
-#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
 	omap3_sram_restore_context();
-#endif
 	return 0;
 }
+#else
+static inline int omap34xx_sram_init(void)
+{
+	return 0;
+}
+#endif /* CONFIG_ARCH_OMAP3 */
 
 static inline int am33xx_sram_init(void)
 {