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>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b7617e3781a2f36e546b858c16ebe48d92927cc3..207dc9592d54545450e169f7334bcbb9dde57a7b 100644 (file)
--- 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"