diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 13:05:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 13:05:10 -0500 |
commit | fc03da1ca1954f103ed57daf90611cefa57b07e0 (patch) | |
tree | 2b9b44b1a39f7743c1c3d7bc89654792686d7dbc /arch/powerpc/Kconfig | |
parent | caf5b04c82f05c65843b2d7189845d6c3df5a41e (diff) | |
parent | e05b3b4adbaeea508bd1c195f1f2e22c8251176b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 01feed0e2a15..df338c5cc910 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -78,17 +78,6 @@ config PPC_UDBG_16550 | |||
78 | bool | 78 | bool |
79 | default n | 79 | default n |
80 | 80 | ||
81 | config CRASH_DUMP | ||
82 | bool "kernel crash dumps (EXPERIMENTAL)" | ||
83 | depends on PPC_MULTIPLATFORM | ||
84 | depends on EXPERIMENTAL | ||
85 | help | ||
86 | Build a kernel suitable for use as a kdump capture kernel. | ||
87 | The kernel will be linked at a different address than normal, and | ||
88 | so can only be used for Kdump. | ||
89 | |||
90 | Don't change this unless you know what you are doing. | ||
91 | |||
92 | config GENERIC_TBSYNC | 81 | config GENERIC_TBSYNC |
93 | bool | 82 | bool |
94 | default y if PPC32 && SMP | 83 | default y if PPC32 && SMP |
@@ -584,6 +573,16 @@ config KEXEC | |||
584 | support. As of this writing the exact hardware interface is | 573 | support. As of this writing the exact hardware interface is |
585 | strongly in flux, so no good recommendation can be made. | 574 | strongly in flux, so no good recommendation can be made. |
586 | 575 | ||
576 | config CRASH_DUMP | ||
577 | bool "kernel crash dumps (EXPERIMENTAL)" | ||
578 | depends on PPC_MULTIPLATFORM && PPC64 && EXPERIMENTAL | ||
579 | help | ||
580 | Build a kernel suitable for use as a kdump capture kernel. | ||
581 | The kernel will be linked at a different address than normal, and | ||
582 | so can only be used for Kdump. | ||
583 | |||
584 | Don't change this unless you know what you are doing. | ||
585 | |||
587 | config EMBEDDEDBOOT | 586 | config EMBEDDEDBOOT |
588 | bool | 587 | bool |
589 | depends on 8xx || 8260 | 588 | depends on 8xx || 8260 |