diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 21:55:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 21:55:54 -0800 |
commit | 4e5df8069b0e4e36c6b528b3be7da298e6f454cd (patch) | |
tree | 19714ceff2e1e25806141e93e603063cd3afb1ee /drivers/edac/edac_core.h | |
parent | aa2cf420593b67cc93de7a3f675b2a88eba0505f (diff) | |
parent | df5b1606bd077401831759171c355dc38cfaa59a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (21 commits)
amd64_edac: bump driver version
amd64_edac: fix use-uninitialised bug
amd64_edac: correct sys address to chip select mapping
amd64_edac: add a leaner syndrome decoding algorithm
amd64_edac: remove early hw support check
amd64_edac: detect DDR3 memory type
edac: add memory types strings for debugging
edac, mce: update AMD F10h revD check
amd64_edac: remove unneeded extract_error_address wrapper
amd64_edac: rename StinkyIdentifier
amd64_edac: remove superfluous dbg printk
amd64_edac: enhance address to DRAM bank mapping
amd64_edac: cleanup f10_early_channel_count
amd64_edac: dump DIMM sizes on K8 too
amd64_edac: cleanup rest of amd64_dump_misc_regs
amd64_edac: cleanup DRAM cfg low debug output
amd64_edac: wrap-up pci config read error handling
amd64_edac: unify MCGCTL ECC switching
cpumask: use modern cpumask style in drivers/edac/amd64_edac.c
amd64_edac: make DRAM regions output more human-readable
...
Diffstat (limited to 'drivers/edac/edac_core.h')
-rw-r--r-- | drivers/edac/edac_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 12f355cafdb..001b2e797fb 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -74,6 +74,7 @@ #ifdef CONFIG_EDAC_DEBUG extern int edac_debug_level; +extern const char *edac_mem_types[]; #ifndef CONFIG_EDAC_DEBUG_VERBOSE #define edac_debug_printk(level, fmt, arg...) \ |