diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
commit | 56d8adc5695a8d3f070c8498d532389580af5611 (patch) | |
tree | bbcb6c38506af002e94e64df8ab1540e6aba7825 /arch/powerpc/Kconfig | |
parent | f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 (diff) | |
parent | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (diff) | |
download | op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.zip op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.tar.gz |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 06d742c..e16b498 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -212,7 +212,7 @@ config ARCH_HIBERNATION_POSSIBLE config ARCH_SUSPEND_POSSIBLE def_bool y depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \ - PPC_85xx || PPC_86xx || PPC_PSERIES + PPC_85xx || PPC_86xx || PPC_PSERIES || 44x || 40x config PPC_DCR_NATIVE bool @@ -598,13 +598,11 @@ config EXTRA_TARGETS If unsure, leave blank -if !44x || BROKEN config ARCH_WANTS_FREEZER_CONTROL def_bool y depends on ADB_PMU source kernel/power/Kconfig -endif config SECCOMP bool "Enable seccomp to safely compute untrusted bytecode" @@ -685,6 +683,15 @@ config FSL_PMC Freescale MPC85xx/MPC86xx power management controller support (suspend/resume). For MPC83xx see platforms/83xx/suspend.c +config PPC4xx_CPM + bool + default y + depends on SUSPEND && (44x || 40x) + help + PPC4xx Clock Power Management (CPM) support (suspend/resume). + It also enables support for two different idle states (idle-wait + and idle-doze). + config 4xx_SOC bool |