- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 5948a21..2bee917 100644 (file)
--- 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_AMD || X86_XEN_MCE)
        default y
        ---help---
          Enable this option if you want to decode Machine Check Exceptions
@@ -74,6 +74,7 @@ config EDAC_MM_EDAC
 config EDAC_AMD64
        tristate "AMD64 (Opteron, Athlon64) K8, F10h"
        depends on EDAC_MM_EDAC && AMD_NB && X86_64 && EDAC_DECODE_MCE
+       depends on !XEN
        help
          Support for error detection and correction of DRAM ECC errors on
          the AMD64 families of memory controllers (K8 and F10h)
@@ -170,7 +171,7 @@ 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 && (X86_MCE_INTEL || X86_XEN_MCE)
        help
          Support for error detection and correction the Intel
          i7 Core (Nehalem) Integrated Memory Controller that exists on
@@ -214,7 +215,7 @@ config EDAC_I7300
 
 config EDAC_SBRIDGE
        tristate "Intel Sandy-Bridge Integrated MC"
-       depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL
+       depends on EDAC_MM_EDAC && PCI && X86_64 && (X86_MCE_INTEL || X86_XEN_MCE)
        depends on EXPERIMENTAL
        help
          Support for error detection and correction the Intel