diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-18 12:09:37 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-18 12:09:37 +1000 |
| commit | 8f3dda75cb942acc049adb2c95a6e5f4c3a8a410 (patch) | |
| tree | d06bac878499d41f33c7937bfe16391d6a833a8f /arch/powerpc/Kconfig | |
| parent | a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077 (diff) | |
| parent | e5462d16f76ad7a9156a82a97fbafba298da9ca6 (diff) | |
Merge remote branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b6ff882f695..8f4d50b0adf 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -209,7 +209,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 || 44x || 40x + (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x config PPC_DCR_NATIVE bool |