diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-30 20:01:50 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-30 20:01:50 -0400 |
| commit | ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2 (patch) | |
| tree | 6539480b50258f30af799a6ab38529d7b2d7e538 /arch/powerpc/Kconfig | |
| parent | 3d00d4ff11686895925f46265f4a78dc78196c2e (diff) | |
| parent | 48936a08b85518c22a9467a8eaac35d43af54ab4 (diff) | |
Merge commit 'kumar/next' into next
Conflicts:
arch/powerpc/sysdev/fsl_msi.c
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 66a315e06dce..328774bd41ee 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -351,7 +351,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE | |||
| 351 | 351 | ||
| 352 | config KEXEC | 352 | config KEXEC |
| 353 | bool "kexec system call (EXPERIMENTAL)" | 353 | bool "kexec system call (EXPERIMENTAL)" |
| 354 | depends on PPC_BOOK3S && EXPERIMENTAL | 354 | depends on (PPC_BOOK3S || (FSL_BOOKE && !SMP)) && EXPERIMENTAL |
| 355 | help | 355 | help |
| 356 | kexec is a system call that implements the ability to shutdown your | 356 | kexec is a system call that implements the ability to shutdown your |
| 357 | current kernel, and to start another kernel. It is like a reboot | 357 | current kernel, and to start another kernel. It is like a reboot |