Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f729f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "EDAC: Correct Kconfig dependencies" 



This reverts commit af9d220b.

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54a33b19

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