From 9929ddb04041d8b2f30f355ca92b7e319d63e837 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 10 Aug 2011 09:43:30 -0300 Subject: [PATCH] --- yaml --- r: 273299 b: refs/heads/master c: 168eb34dedf2f9456cc26f513d27de65c64fc608 h: refs/heads/master i: 273297: c2cf1b17afce0e2d8f182c42b1425f0baf8e28fd 273295: b3e776edad10e4defa78b1f7d8f075933c5f7852 v: v3 --- [refs] | 2 +- trunk/drivers/edac/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f192f227262e..9a23b91940ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4055759145b421537207ed0d034041f1774ab41d +refs/heads/master: 168eb34dedf2f9456cc26f513d27de65c64fc608 diff --git a/trunk/drivers/edac/Kconfig b/trunk/drivers/edac/Kconfig index f888fb599184..d057d6c40208 100644 --- a/trunk/drivers/edac/Kconfig +++ b/trunk/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 @@ -170,8 +170,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