]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
OMAP4: PM: remove redundant #ifdef CONFIG_PM
authorNishanth Menon <nm@ti.com>
Wed, 27 Apr 2011 13:13:05 +0000 (06:13 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 May 2011 09:38:03 +0000 (02:38 -0700)
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>
arch/arm/mach-omap2/pm44xx.c

index 76cfff2db5141e26b2b0b7a0396abb37f342ec92..59a870be8390289931bde435d0499952ec9ecb00 100644 (file)
@@ -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);