diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-11 08:58:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-11 08:58:41 -0700 |
| commit | a9f729f0e28bb4e4ab0d9e9e3c1675fe4b910f47 (patch) | |
| tree | cfc565cffeb30ffccc1438b1bd88b9a372ed26c3 | |
| parent | 54a33b190aa5386dd214b4ad02986445e20e83d1 (diff) | |
| download | op-kernel-dev-a9f729f0e28bb4e4ab0d9e9e3c1675fe4b910f47.zip op-kernel-dev-a9f729f0e28bb4e4ab0d9e9e3c1675fe4b910f47.tar.gz | |
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>
| -rw-r--r-- | drivers/edac/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
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 |
