diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 22:18:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 22:18:43 +0200 |
| commit | f1618a7a27df4f7870c1d5f25f0aba62b52069a2 (patch) | |
| tree | 1f3c1b2d1005814a9e862ba2f8596f665d780948 /arch | |
| parent | ee42f75dba3c66e559a13ac86ad1889d2a396378 (diff) | |
| parent | 75d6137da195a1e059e1c814cb95635e168f85c0 (diff) | |
| download | linux-f1618a7a27df4f7870c1d5f25f0aba62b52069a2.tar.gz linux-f1618a7a27df4f7870c1d5f25f0aba62b52069a2.tar.bz2 linux-f1618a7a27df4f7870c1d5f25f0aba62b52069a2.zip | |
Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into pm-cpuidle
Pull ARM cpuidle updates from Daniel Lezcano.
* 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux:
cpuidle: kirkwood: Make kirkwood_cpuidle_remove function static
cpuidle: calxeda: Add missing __iomem annotation
SH: cpuidle: Add missing parameter for cpuidle_register()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/cpuidle.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index d30622592116..e3abfd4277e2 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c @@ -91,13 +91,11 @@ static struct cpuidle_driver cpuidle_driver = { int __init sh_mobile_setup_cpuidle(void) { - int ret; - if (sh_mobile_sleep_supported & SUSP_SH_SF) cpuidle_driver.states[1].disabled = false; if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) cpuidle_driver.states[2].disabled = false; - return cpuidle_register(&cpuidle_driver); + return cpuidle_register(&cpuidle_driver, NULL); } |