diff options
| author | Daniel J Blueman <daniel@numascale-asia.com> | 2012-01-25 14:35:49 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-26 11:03:03 +0100 |
| commit | 3fe54564a61f72982032423d24041dca30617ca2 (patch) | |
| tree | 77d3cf8a2d30988161e17e124a9c039267146009 | |
| parent | d2ebc71d472020bc30e29afe8c4d2a85a5b41f56 (diff) | |
| download | linux-3.10-3fe54564a61f72982032423d24041dca30617ca2.tar.gz linux-3.10-3fe54564a61f72982032423d24041dca30617ca2.tar.bz2 linux-3.10-3fe54564a61f72982032423d24041dca30617ca2.zip | |
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@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>
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 864cc6e6ac8..5bed94e189f 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. |