summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-29 14:50:17 +0000
committerArnd Bergmann <arnd@arndb.de>2011-11-29 14:50:17 +0000
commit98014be39bda8277a5ad130bb274ed6eb18b74df (patch)
tree974620a47c9350ff9b3c06ffd2b49470bbda72ab /arch/powerpc/Kconfig
parent55135dfbf3dd83cb3e98deed8271b62d188404e1 (diff)
parent6e2a587eb99267367409097b70cb2d61b09e5269 (diff)
downloadblackbird-op-linux-98014be39bda8277a5ad130bb274ed6eb18b74df.tar.gz
blackbird-op-linux-98014be39bda8277a5ad130bb274ed6eb18b74df.zip
Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b177caa56d95..951e18f5335b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -345,7 +345,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
config KEXEC
bool "kexec system call (EXPERIMENTAL)"
- depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !47x)) && EXPERIMENTAL
+ depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !PPC_47x)) && EXPERIMENTAL
help
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
OpenPOWER on IntegriCloud