diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b090e5a27dac..b7617e3781a2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -271,16 +271,6 @@ config X86_PC
 	help
 	  Choose this option if your computer is a standard PC or compatible.
 
-config X86_ELAN
-	bool "AMD Elan"
-	depends on X86_32
-	help
-	  Select this for an AMD Elan processor.
-
-	  Do not use this option for K6/Athlon/Opteron processors!
-
-	  If unsure, choose "PC-compatible" instead.
-
 config X86_VOYAGER
 	bool "Voyager (NCR)"
 	depends on X86_32 && SMP && !PCI && BROKEN
@@ -394,6 +384,17 @@ config X86_UV
 	  This option is needed in order to support SGI Ultraviolet systems.
 	  If you don't have one of these, you should say N here.
 
+config X86_ELAN
+	bool "AMD Elan"
+	depends on X86_32
+	depends on X86_NON_STANDARD
+	help
+	  Select this for an AMD Elan processor.
+
+	  Do not use this option for K6/Athlon/Opteron processors!
+
+	  If unsure, choose "PC-compatible" instead.
+
 config SCHED_OMIT_FRAME_POINTER
 	def_bool y
 	prompt "Single-depth WCHAN output"