diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2012-01-05 01:27:48 +0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-21 03:55:06 +0400 |
| commit | 0bcd24b0f414003c695e2ecf16b9ffa14d184f48 (patch) | |
| tree | eee9b72c44f0b745b29cf2733e625f4f654a1a28 /arch/arm/mach-omap2/pm44xx.c | |
| parent | 4fa20439a80c008d33f2865b0db94dcb5da467e2 (diff) | |
| download | linux-0bcd24b0f414003c695e2ecf16b9ffa14d184f48.tar.xz | |
ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index c264ef7219c1..62d4f36c57a6 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -178,13 +178,11 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) */ static void omap_default_idle(void) { - local_irq_disable(); local_fiq_disable(); omap_do_wfi(); local_fiq_enable(); - local_irq_enable(); } /** @@ -256,7 +254,7 @@ static int __init omap4_pm_init(void) #endif /* CONFIG_SUSPEND */ /* Overwrite the default arch_idle() */ - pm_idle = omap_default_idle; + arm_pm_idle = omap_default_idle; omap4_idle_init(); |