diff --git a/[refs] b/[refs]
index 5b23cd4cfeba..58dde5a76e1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a95436e44a76a32dcbe7c8df59701ddde53017c1
+refs/heads/master: c31d96338a6041520ba5f1b6a4a5012ef00686b3
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 356d2ec8e2fb..5962b872a7ad 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -823,7 +823,7 @@ config X86_MCE_AMD
 
 config X86_ANCIENT_MCE
 	def_bool n
-	depends on X86_32
+	depends on X86_32 && X86_MCE
 	prompt "Support for old Pentium 5 / WinChip machine checks"
 	---help---
 	  Include support for machine check handling on old Pentium 5 or WinChip