diff --git a/[refs] b/[refs]
index f8985f080435..2029d27fbe52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c39801763ed6e08ea8bc694c5ab936643a2b763
+refs/heads/master: 6a48565ed6ac76f351def25cd5e9f181331065f6
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 2fe298297cee..ddddfb8fe091 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -271,15 +271,6 @@ config X86_PC
 	help
 	  Choose this option if your computer is a standard PC or compatible.
 
-config X86_VSMP
-	bool "Support for ScaleMP vSMP"
-	select PARAVIRT
-	depends on X86_64 && PCI
-	help
-	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
-	  supposed to run on these EM64T-based machines.  Only choose this option
-	  if you have one of these machines.
-
 endchoice
 
 config X86_NON_STANDARD
@@ -327,6 +318,16 @@ 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_VSMP
+	bool "Support for ScaleMP vSMP"
+	select PARAVIRT
+	depends on X86_64 && PCI
+	depends on X86_NON_STANDARD
+	help
+	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
+	  supposed to run on these EM64T-based machines.  Only choose this option
+	  if you have one of these machines.
+
 config X86_ELAN
 	bool "AMD Elan"
 	depends on X86_32