Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / edac / edac_core.h

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 251440cd50a3b41ea47f4511365909b707ebf0e8..3d965347a673ccf23e5b14247608450bc2c9cc51 100644 (file)
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -68,9 +68,10 @@
 #define EDAC_PCI "PCI"
 #define EDAC_DEBUG "DEBUG"
 
+extern const char *edac_mem_types[];
+
 #ifdef CONFIG_EDAC_DEBUG
 extern int edac_debug_level;
-extern const char *edac_mem_types[];
 
 #define edac_debug_printk(level, fmt, arg...)                           \
        do {                                                            \
@@ -258,7 +259,7 @@ enum scrub_type {
  *                     for single channel are 64 bits, for dual channel 128
  *                     bits.
  *
- * Single-Ranked stick:        A Single-ranked stick has 1 chip-select row of memmory.
+ * Single-Ranked stick:        A Single-ranked stick has 1 chip-select row of memory.
  *                     Motherboards commonly drive two chip-select pins to
  *                     a memory stick. A single-ranked stick, will occupy
  *                     only one of those rows. The other will be unused.
@@ -386,7 +387,7 @@ struct mem_ctl_info {
           representation and converts it to the closest matching
           bandwith in bytes/sec.
         */
-       int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 * bw);
+       int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci);
 
 
        /* pointer to edac checking routine */