diff options
author | Nishanth Menon <nm@ti.com> | 2011-04-27 09:13:05 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-05-03 05:38:03 -0400 |
commit | 34549009a1a48e9212508aa32a90281e682c52b1 (patch) | |
tree | 36625bd3f7c53795057e2b9db5e40df5cb36d14e /arch/arm/mach-omap2 | |
parent | 283a1c1f276d879ab8bafec8ec9f8fca03f159bb (diff) |
OMAP4: PM: remove redundant #ifdef CONFIG_PM
pm44xx.c is built only when CONFIG_PM is setup,
remove redundant CONFIG_PM check.
This also fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=25022
Reported-by: Martin Etti <ettl.martin@gmx.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 76cfff2db514..59a870be8390 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c | |||
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void) | |||
105 | 105 | ||
106 | pr_err("Power Management for TI OMAP4.\n"); | 106 | pr_err("Power Management for TI OMAP4.\n"); |
107 | 107 | ||
108 | #ifdef CONFIG_PM | ||
109 | ret = pwrdm_for_each(pwrdms_setup, NULL); | 108 | ret = pwrdm_for_each(pwrdms_setup, NULL); |
110 | if (ret) { | 109 | if (ret) { |
111 | pr_err("Failed to setup powerdomains\n"); | 110 | pr_err("Failed to setup powerdomains\n"); |
112 | goto err2; | 111 | goto err2; |
113 | } | 112 | } |
114 | #endif | ||
115 | 113 | ||
116 | #ifdef CONFIG_SUSPEND | 114 | #ifdef CONFIG_SUSPEND |
117 | suspend_set_ops(&omap_pm_ops); | 115 | suspend_set_ops(&omap_pm_ops); |