diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:00:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:00:40 +1000 |
| commit | 1d42fcfe774211af917889db5bfff7ccb6b226fa (patch) | |
| tree | 51bda16f752c893aba2aedb36dd314768401b59f /drivers/edac | |
| parent | 189da3b9ff1fa12056be78d769970410b11e83c9 (diff) | |
| parent | 30e8e851f9c57d4710754438c296fe3e92a525a1 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/Kconfig
drivers/acpi/acpi_extlog.c
drivers/net/wireless/ath/ath9k/hw.c
fs/nfs/pagelist.c
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/edac/edac_mc.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 878f09005fad..d3c0465ba456 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -72,6 +72,7 @@ config EDAC_MCE_INJ config EDAC_MM_EDAC tristate "Main Memory EDAC (Error Detection And Correction) reporting" + select RAS help Some systems are able to detect and correct errors in main memory. EDAC can report statistics on memory error diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 2c694b5297cc..9f134823fa75 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -33,9 +33,6 @@ #include <asm/edac.h> #include "edac_core.h" #include "edac_module.h" - -#define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../../include/ras #include <ras/ras_event.h> /* lock to memory controller's control array */ |