diff --git a/[refs] b/[refs] index 63aaa7208d17..69569aae7402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7856f6cce4a8cda8c1f94b99605c07d16b8d8dec +refs/heads/master: de5619dfef76ddb403eb7c6de39c0130166c5dc3 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index e1c9f77f69ec..a148e7ac0d83 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -816,7 +816,7 @@ config X86_MCE_INTEL config X86_MCE_AMD def_bool y prompt "AMD MCE features" - depends on X86_64 && X86_MCE && X86_LOCAL_APIC + depends on X86_NEW_MCE && X86_LOCAL_APIC ---help--- Additional support for AMD specific MCE features such as the DRAM Error Threshold.