From: Linus Torvalds Date: Thu, 11 Aug 2011 15:58:41 +0000 (-0700) Subject: Revert "EDAC: Correct Kconfig dependencies" X-Git-Tag: v3.1-rc2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9f729f0e28bb4e4ab0d9e9e3c1675fe4b910f47;p=platform%2Fkernel%2Flinux-3.10.git Revert "EDAC: Correct Kconfig dependencies" This reverts commit af9d220bac41dc3201893e1601cc7c44f7da4498. 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 Acked-by: Borislav Petkov Cc: Randy Dunlap Signed-off-by: Linus Torvalds --- diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index c422fea..af1a17d 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -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