From 63bf79970718e4a3657001bf767022221a40fa45 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Mon, 29 Oct 2012 20:57:55 -0600
Subject: [PATCH] --- yaml --- r: 339807 b: refs/heads/master c:
 2577a4a6096017f3152339c562ada77e182c8976 h: refs/heads/master i:   339805:
 ba6eb290950336b289738595d48a3b2af66c226e   339803:
 701068edbfe00ef1d11977a888f52daa7195356d   339799:
 7e36194cf26ba4802a516fb23be9bd08a63b88a9   339791:
 b6bf03cb9a80910556133bdec1fb40766f33312e   339775:
 9dce7e59a0f7d439aec6665582fb2cbac8c347af v: v3

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

diff --git a/[refs] b/[refs]
index 1adb4ad14c1b..bebfb0983c2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b13159afb46f8a528fcf30bac26c07dbb40a784a
+refs/heads/master: 2577a4a6096017f3152339c562ada77e182c8976
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 54b68121734c..9658e6b8ed84 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -2062,7 +2062,8 @@ static int _enable(struct omap_hwmod *oh)
 			_enable_sysc(oh);
 		}
 	} else {
-		_omap4_disable_module(oh);
+		if (soc_ops.disable_module)
+			soc_ops.disable_module(oh);
 		_disable_clocks(oh);
 		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",
 			 oh->name, r);