diff options
| author | Colin Cross <ccross@android.com> | 2011-11-14 14:32:40 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-11-14 14:32:40 -0800 |
| commit | c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a (patch) | |
| tree | 92087ade8e0968fd4eba07773ca4bac21de40588 /arch/arm/mach-omap2/pm44xx.c | |
| parent | 186995652737d68b381c88959b506c6cacaf08b1 (diff) | |
| parent | 9f669fc19d10d21085d45af47fa0256923668b95 (diff) | |
| download | kernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.zip kernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.tar.gz kernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rwxr-xr-x | arch/arm/mach-omap2/pm44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 63e09a4..f10e6ca 100755 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -162,7 +162,7 @@ void omap4_enter_sleep(unsigned int cpu, unsigned int power_state, bool suspend) core_next_state = pwrdm_read_next_pwrst(core_pwrdm); mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); - ret = omap2_gpio_prepare_for_idle(omap4_device_next_state_off()); + ret = omap2_gpio_prepare_for_idle(omap4_device_next_state_off(), suspend); if (ret) goto abort_gpio; |