tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <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>

Linus Torvalds a9f729f0 54a33b19

+3 -2
+3 -2
drivers/edac/Kconfig
··· 41 41 42 42 config EDAC_DECODE_MCE 43 43 tristate "Decode MCEs in human-readable form (only on AMD for now)" 44 - depends on CPU_SUP_AMD && X86_MCE_AMD 44 + depends on CPU_SUP_AMD && X86_MCE 45 45 default y 46 46 ---help--- 47 47 Enable this option if you want to decode Machine Check Exceptions ··· 173 173 174 174 config EDAC_I7CORE 175 175 tristate "Intel i7 Core (Nehalem) processors" 176 - depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL 176 + depends on EDAC_MM_EDAC && PCI && X86 177 + select EDAC_MCE 177 178 help 178 179 Support for error detection and correction the Intel 179 180 i7 Core (Nehalem) Integrated Memory Controller that exists on