From 15585c1c1d98fb1329040c47717762bc7806a233 Mon Sep 17 00:00:00 2001
From: jean-philippe francois <jp.francois@cynove.com>
Date: Thu, 16 May 2013 11:25:07 -0700
Subject: [PATCH] --- yaml --- r: 376212 b: refs/heads/master c:
 0f497039276fa2ca2ca324236848bb15c8c775dc h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 677741f56b31..12878fa96e41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 304e71e0ad4125c29a0731491b75c3b83530d616
+refs/heads/master: 0f497039276fa2ca2ca324236848bb15c8c775dc
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index d25a95fe9921..e3289888adfa 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -2065,7 +2065,7 @@ static int _omap4_get_context_lost(struct omap_hwmod *oh)
  * do so is present in the hwmod data, then call it and pass along the
  * return value; otherwise, return 0.
  */
-static int __init _enable_preprogram(struct omap_hwmod *oh)
+static int _enable_preprogram(struct omap_hwmod *oh)
 {
 	if (!oh->class->enable_preprogram)
 		return 0;