diff --git a/[refs] b/[refs]
index 2a101218d9d7..55aa4b790a35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ebc71d472020bc30e29afe8c4d2a85a5b41f56
+refs/heads/master: 3fe54564a61f72982032423d24041dca30617ca2
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 864cc6e6ac8e..5bed94e189fa 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -360,7 +360,6 @@ config X86_NUMACHIP
 	depends on NUMA
 	depends on SMP
 	depends on X86_X2APIC
-	depends on !EDAC_AMD64
 	---help---
 	  Adds support for Numascale NumaChip large-SMP systems. Needed to
 	  enable more than ~168 cores.