diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 11:48:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 11:48:36 -0800 |
| commit | 73c8e679aa8d123c1b05fa837daacd0aa0c4cb85 (patch) | |
| tree | f1f891b6c5997e83ebd75685c6532acc03de2392 /drivers | |
| parent | 0200971d2f6a5443869fae7ef8a5f4c8606e5446 (diff) | |
| parent | 18b246fa60dd4bfc71c78d669e2ffaa5df454d6a (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
BenH says:
'Here are a few more powerpc bits for you. A stupid regression I
introduced with my previous commit to "fix" program check exceptions
(brown paper bag for me), fix the cpuidle default, a bug fix for
something that isn't strictly speaking a regression but some upstream
changes causes it to show in lockdep now while it didn't before, and
finally a trivial one for rusty to make his life easier later on
removing the old cpumask cruft. '
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix various issues with return to userspace
cpuidle: Default y on powerpc pSeries
powerpc: Fix program check handling when lockdep is enabled
powerpc: Remove references to cpu_*_map
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig index 7dbc4a83c45..78a666d1e5f 100644 --- a/drivers/cpuidle/Kconfig +++ b/drivers/cpuidle/Kconfig @@ -1,7 +1,7 @@ config CPU_IDLE bool "CPU idle PM support" - default ACPI + default y if ACPI || PPC_PSERIES help CPU idle is a generic framework for supporting software-controlled idle processor power management. It includes modular cross-platform |