Commit 0925f2cd authored Dec 14, 2013 by Linus Torvalds

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

parents b2077ebc bd4b9683

drivers/edac/sb_edac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;


		/*