From: Borislav Petkov Date: Wed, 10 Aug 2011 12:43:30 +0000 (+0200) Subject: EDAC: Correct Kconfig dependencies X-Git-Tag: v3.1-rc2~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af9d220bac41dc3201893e1601cc7c44f7da4498;p=platform%2Fkernel%2Flinux-exynos.git EDAC: Correct Kconfig dependencies Both AMD and Intel i7 EDAC drivers use MCE features and are thus dependent of this functionality present in the kernel. Express this in Kconfig so that randconfig builds don't break. Reported-by: Randy Dunlap Signed-off-by: Borislav Petkov Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds --- diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index af1a17d..c422fea 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 + depends on CPU_SUP_AMD && X86_MCE_AMD default y ---help--- Enable this option if you want to decode Machine Check Exceptions @@ -173,8 +173,7 @@ config EDAC_I5400 config EDAC_I7CORE tristate "Intel i7 Core (Nehalem) processors" - depends on EDAC_MM_EDAC && PCI && X86 - select EDAC_MCE + depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL help Support for error detection and correction the Intel i7 Core (Nehalem) Integrated Memory Controller that exists on