diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-18 08:04:33 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-18 08:04:33 +0200 |
| commit | caa1d631fc99940f866480c2bb88a6f5a235e7a2 (patch) | |
| tree | d09d648dbccaa7bf23deb336e8cf52acbc360b8d /arch/powerpc/Kconfig | |
| parent | powerpc/eeh: Fix crash on converting OF node to edev (diff) | |
| parent | powerpc/fsl-pci: Unify pci/pcie initialization code (diff) | |
| download | linux-caa1d631fc99940f866480c2bb88a6f5a235e7a2.tar.xz linux-caa1d631fc99940f866480c2bb88a6f5a235e7a2.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 748ccaa3b4b3..4ce0be32d153 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -215,7 +215,8 @@ config ARCH_HIBERNATION_POSSIBLE config ARCH_SUSPEND_POSSIBLE def_bool y depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \ - (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x + (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \ + || 44x || 40x config PPC_DCR_NATIVE bool @@ -328,7 +329,8 @@ config SWIOTLB config HOTPLUG_CPU bool "Support for enabling/disabling CPUs" - depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC || PPC_POWERNV) + depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \ + PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC)) ---help--- Say Y here to be able to disable and re-enable individual CPUs at runtime on SMP machines. |