diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /arch/ia64/Kconfig | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 18bcc10903b4..451f2ffb137b 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -540,8 +540,8 @@ config KEXEC | |||
| 540 | strongly in flux, so no good recommendation can be made. | 540 | strongly in flux, so no good recommendation can be made. |
| 541 | 541 | ||
| 542 | config CRASH_DUMP | 542 | config CRASH_DUMP |
| 543 | bool "kernel crash dumps (EXPERIMENTAL)" | 543 | bool "kernel crash dumps" |
| 544 | depends on EXPERIMENTAL && IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) | 544 | depends on IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) |
| 545 | help | 545 | help |
| 546 | Generate crash dump after being started by kexec. | 546 | Generate crash dump after being started by kexec. |
| 547 | 547 | ||