[tip:x86/urgent] x86/numachip: Drop unnecessary conflict with EDAC

[tip-bot for Daniel J Blueman]

Commit-ID:  3fe54564a61f72982032423d24041dca30617ca2
Gitweb:     http://git.kernel.org/tip/3fe54564a61f72982032423d24041dca30617ca2
Author:     Daniel J Blueman <daniel@xxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 25 Jan 2012 14:35:49 +0800
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 26 Jan 2012 11:03:03 +0100

x86/numachip: Drop unnecessary conflict with EDAC

EDAC detection no longer crashes multi-node systems, so don't
conflict on it with NumaChip.

Signed-off-by: Daniel J Blueman <daniel@xxxxxxxxxxxxxxxxxx>
Cc: Steffen Persvold <sp@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1327473349-28395-1-git-send-email-daniel@xxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 864cc6e..5bed94e 100644
--- a/arch/x86/Kconfig
+++ b/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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/