diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /arch/powerpc/Kconfig | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
Merge branch 'fix/misc' into topic/misc
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 |