diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:20:09 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 08:17:16 -0500 |
commit | f67ae5c9e52e385492b94c14376e322004701555 (patch) | |
tree | 4acab0b2be26ef0e71055f34dc3344dddf7c1ead /arch/x86/Kconfig | |
parent | 9e111f3e167a14dd6252cff14fc7dd2ba4c650c6 (diff) |
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/Kconfig | 25 |
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 | |||
271 | help | 271 | help |
272 | Choose this option if your computer is a standard PC or compatible. | 272 | Choose this option if your computer is a standard PC or compatible. |
273 | 273 | ||
274 | config X86_VOYAGER | ||
275 | bool "Voyager (NCR)" | ||
276 | depends on X86_32 && SMP && !PCI && BROKEN | ||
277 | help | ||
278 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | ||
279 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | ||
280 | |||
281 | *** WARNING *** | ||
282 | |||
283 | If you do not specifically know you have a Voyager based machine, | ||
284 | say N here, otherwise the kernel you build will not be bootable. | ||
285 | |||
286 | config X86_GENERICARCH | 274 | config X86_GENERICARCH |
287 | bool "Generic architecture" | 275 | bool "Generic architecture" |
288 | depends on X86_32 | 276 | depends on X86_32 |
@@ -395,6 +383,19 @@ config X86_ELAN | |||
395 | 383 | ||
396 | If unsure, choose "PC-compatible" instead. | 384 | If unsure, choose "PC-compatible" instead. |
397 | 385 | ||
386 | config X86_VOYAGER | ||
387 | bool "Voyager (NCR)" | ||
388 | depends on X86_32 && SMP && !PCI && BROKEN | ||
389 | depends on X86_NON_STANDARD | ||
390 | help | ||
391 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | ||
392 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | ||
393 | |||
394 | *** WARNING *** | ||
395 | |||
396 | If you do not specifically know you have a Voyager based machine, | ||
397 | say N here, otherwise the kernel you build will not be bootable. | ||
398 | |||
398 | config SCHED_OMIT_FRAME_POINTER | 399 | config SCHED_OMIT_FRAME_POINTER |
399 | def_bool y | 400 | def_bool y |
400 | prompt "Single-depth WCHAN output" | 401 | prompt "Single-depth WCHAN output" |