aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-14 09:37:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-14 09:37:17 -0800
commit0925f2cdf9d11fb24130d00d6bbea84502610535 (patch)
treeb1ba046d44cdb53c720ee3a4001adfa2d293105e
parentb2077ebc19a4792d1b4749ab9fe013c893588989 (diff)
parentbd4b9683623d0d91e87cf22f09008c05f56d7483 (diff)
downloadlinux-stericsson-0925f2cdf9d11fb24130d00d6bbea84502610535.tar.gz
Merge tag 'edac_fixes_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fix from Borislav Petkov: "Silence a compiler warning in sb_edac" * tag 'edac_fixes_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: sb_edac: Shut up compiler warning when EDAC_DEBUG is enabled
-rw-r--r--drivers/edac/sb_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 8472405c5586..d7f1b57bd3be 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -945,7 +945,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
u32 tad_offset;
u32 rir_way;
u32 mb, kb;
- u64 ch_addr, offset, limit, prv = 0;
+ u64 ch_addr, offset, limit = 0, prv = 0;
/*