diff --git a/[refs] b/[refs]
index fcaf989e0d5c..181d2fbc8498 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf660254e0d430e5d991e432d5dad8d6714828f6
+refs/heads/master: c38bfdc85aae0c6d1458269c0e063c2f4a116711
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index 2206bf6637de..0f8da3bea1d1 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -324,6 +324,15 @@ config X86_MCE_P4THERMAL
 	  Enabling this feature will cause a message to be printed when the P4
 	  enters thermal throttling.
 
+config VM86
+	default y
+	bool "Enable VM86 support" if EMBEDDED
+	help
+          This option is required by programs like DOSEMU to run 16-bit legacy
+	  code on X86 processors. It also may be needed by software like
+          XFree86 to initialize some video cards via BIOS. Disabling this
+          option saves about 6k.
+
 config TOSHIBA
 	tristate "Toshiba Laptop support"
 	---help---
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index e0358f3946a1..36b02d5924e9 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -236,16 +236,6 @@ config UID16
 	help
 	  This enables the legacy 16-bit UID syscall wrappers.
 
-config VM86
-	depends X86
-	default y
-	bool "Enable VM86 support" if EMBEDDED
-	help
-          This option is required by programs like DOSEMU to run 16-bit legacy
-	  code on X86 processors. It also may be needed by software like
-          XFree86 to initialize some video cards via BIOS. Disabling this
-          option saves about 6k.
-
 config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size (Look out for broken compilers!)"
 	default y