x86/Voyager: move to the X86_32_NON_STANDARD code section

Make Voyager depend on X86_32_NON_STANDARD - it is a non-standard 32-bit
SMP architecture.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1427cb1ccd97559d9b96773aed571f5f938ab7c6..5bf0e0c58289d840e881319f92ae6d29a4216b2f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -331,19 +331,6 @@ 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 X86_32_NON_STANDARD
        bool "Support non-standard 32-bit SMP architectures"
        depends on X86_32 && SMP
@@ -354,6 +341,13 @@ config X86_32_NON_STANDARD
          if you select them all, kernel will probe it one by one. and will
          fallback to default.
 
+config X86_BIGSMP
+       bool "Support for big SMP systems with more than 8 CPUs"
+       depends on X86_32_NON_STANDARD
+       help
+         This option is needed for the systems that have more than 8 CPUs
+         and if the system is not of any sub-arch type above.
+
 config X86_NUMAQ
        bool "NUMAQ (IBM/Sequent)"
        depends on X86_32_NON_STANDARD
@@ -380,12 +374,18 @@ config X86_ES7000
          Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
          supposed to run on an IA32-based Unisys ES7000 system.
 
-config X86_BIGSMP
-       bool "Support for big SMP systems with more than 8 CPUs"
+config X86_VOYAGER
+       bool "Voyager (NCR)"
+       depends on SMP && !PCI && BROKEN
        depends on X86_32_NON_STANDARD
        help
-         This option is needed for the systems that have more than 8 CPUs
-         and if the system is not of any sub-arch type above.
+         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