---

yaml
---
r: 273299
b: refs/heads/master
c: 168eb34
h: refs/heads/master
i:
  273297: c2cf1b1
  273295: b3e776e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4055759145b421537207ed0d034041f1774ab41d
+refs/heads/master: 168eb34dedf2f9456cc26f513d27de65c64fc608

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