diff options
| author | Nishanth Menon <nm@ti.com> | 2011-04-27 06:13:05 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-03 02:38:03 -0700 |
| commit | 34549009a1a48e9212508aa32a90281e682c52b1 (patch) | |
| tree | 36625bd3f7c53795057e2b9db5e40df5cb36d14e | |
| parent | 283a1c1f276d879ab8bafec8ec9f8fca03f159bb (diff) | |
| download | linux-rpi-34549009a1a48e9212508aa32a90281e682c52b1.tar.gz linux-rpi-34549009a1a48e9212508aa32a90281e682c52b1.tar.bz2 linux-rpi-34549009a1a48e9212508aa32a90281e682c52b1.zip | |
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>
| -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) 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); |