[PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM
From: Kevin Hilman <hidden>
Date: 2011-03-17 21:43:31
Also in:
linux-omap
Nishanth Menon [off-list ref] writes:
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 <redacted> Signed-off-by: Nishanth Menon <nm@ti.com>
Thanks, queuing for 2.6.39-rc fixes cycle (branch: for_2.6.39/pm-fixes) Kevin
quoted hunk
--- 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 76cfff2..59a870b 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);