提交 a9f729f0 编写于 作者: L Linus Torvalds

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: NStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: NBorislav Petkov <borislav.petkov@amd.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 54a33b19
...@@ -41,7 +41,7 @@ config EDAC_DEBUG ...@@ -41,7 +41,7 @@ config EDAC_DEBUG
config EDAC_DECODE_MCE config EDAC_DECODE_MCE
tristate "Decode MCEs in human-readable form (only on AMD for now)" 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 default y
---help--- ---help---
Enable this option if you want to decode Machine Check Exceptions Enable this option if you want to decode Machine Check Exceptions
...@@ -173,7 +173,8 @@ config EDAC_I5400 ...@@ -173,7 +173,8 @@ config EDAC_I5400
config EDAC_I7CORE config EDAC_I7CORE
tristate "Intel i7 Core (Nehalem) processors" 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 help
Support for error detection and correction the Intel Support for error detection and correction the Intel
i7 Core (Nehalem) Integrated Memory Controller that exists on i7 Core (Nehalem) Integrated Memory Controller that exists on
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册