---

yaml --- r: 251843 b: refs/heads/master c: 3454900 h: refs/heads/master i: 251841: 6761393 251839: 164d3b0 v: v3
git-mirror · May 3, 2011 · 77de9f6 · 77de9f6
1 parent 64a147e
commit 77de9f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283a1c1f276d879ab8bafec8ec9f8fca03f159bb
+refs/heads/master: 34549009a1a48e9212508aa32a90281e682c52b1
diff --git a/trunk/arch/arm/mach-omap2/pm44xx.c b/trunk/arch/arm/mach-omap2/pm44xx.c
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
 
 	pr_err("Power Management for TI OMAP4.\n");
 
-#ifdef CONFIG_PM
 	ret = pwrdm_for_each(pwrdms_setup, NULL);
 	if (ret) {
 		pr_err("Failed to setup powerdomains\n");
 		goto err2;
 	}
-#endif
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);