Revert "EDAC: Correct Kconfig dependencies" (a9f729f0) · Commits · 戴 / test

This reverts commit . It turns out that one was meant to be applied on top of the edac.git tree in -next that has more i7core_edac changes, but that wasn't clear in the original email. Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Acked-by:

Borislav Petkov <borislav.petkov@amd.com> Cc: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/edac/Kconfig

+3 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ config EDAC_DEBUG

		config EDAC_DECODE_MCE
		tristate "Decode MCEs in human-readable form (only on AMD for now)"
		depends on CPU_SUP_AMD && X86_MCE_AMD
		depends on CPU_SUP_AMD && X86_MCE
		default y
		---help---
		Enable this option if you want to decode Machine Check Exceptions
		@@ -173,7 +173,8 @@ config EDAC_I5400

		config EDAC_I7CORE
		tristate "Intel i7 Core (Nehalem) processors"
		depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL
		depends on EDAC_MM_EDAC && PCI && X86
		select EDAC_MCE
		help
		Support for error detection and correction the Intel
		i7 Core (Nehalem) Integrated Memory Controller that exists on

Admin message