summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-27 20:20:09 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-29 16:17:16 +0300
commitf67ae5c9e52e385492b94c14376e322004701555 (patch)
tree4acab0b2be26ef0e71055f34dc3344dddf7c1ead /arch/x86/Kconfig
parent9e111f3e167a14dd6252cff14fc7dd2ba4c650c6 (diff)
downloadlinux-f67ae5c9e52e385492b94c14376e322004701555.tar.xz
x86: move VOYAGER to the NON_STANDARD_PLATFORM section
Move X86_ELAN (old, NCR hw platform built on Intel CPUs) from the subarchitecture menu to the non-standard-platform section. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig25
1 files changed, 13 insertions, 12 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b7617e3781a2..207dc9592d54 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -271,18 +271,6 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
-config X86_VOYAGER
- bool "Voyager (NCR)"
- depends on X86_32 && SMP && !PCI && BROKEN
- help
- Voyager is an MCA-based 32-way capable SMP architecture proprietary
- to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
-
- *** WARNING ***
-
- If you do not specifically know you have a Voyager based machine,
- say N here, otherwise the kernel you build will not be bootable.
-
config X86_GENERICARCH
bool "Generic architecture"
depends on X86_32
@@ -395,6 +383,19 @@ config X86_ELAN
If unsure, choose "PC-compatible" instead.
+config X86_VOYAGER
+ bool "Voyager (NCR)"
+ depends on X86_32 && SMP && !PCI && BROKEN
+ depends on X86_NON_STANDARD
+ help
+ Voyager is an MCA-based 32-way capable SMP architecture proprietary
+ to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
+
+ *** WARNING ***
+
+ If you do not specifically know you have a Voyager based machine,
+ say N here, otherwise the kernel you build will not be bootable.
+
config SCHED_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"