projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2ebc71)
x86/numachip: Drop unnecessary conflict with EDAC
authorDaniel J Blueman <daniel@numascale-asia.com>
Wed, 25 Jan 2012 06:35:49 +0000 (14:35 +0800)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Jan 2012 10:03:03 +0000 (11:03 +0100)
EDAC detection no longer crashes multi-node systems, so don't
conflict on it with NumaChip.

Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Link: http://lkml.kernel.org/r/1327473349-28395-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig patch | blob | blame | history

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 864cc6e6ac8e300d35b45c6b749f2ee93555c891..5bed94e189fab8ef9bf24f038763ee90bc45b798 100644 (file)
--- 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.