| commit | f8647b506d7116a1a3accd8d618184096e85f50b | [log] [tgz] |
|---|---|---|
| author | Ralf Baechle <ralf@linux-mips.org> | Wed Jun 04 22:53:02 2014 +0200 |
| committer | Ralf Baechle <ralf@linux-mips.org> | Wed Jun 04 22:53:02 2014 +0200 |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 | |
| parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e [diff] [blame] | |
| parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 [diff] [blame] |
Merge branch '3.15-fixes' into mips-for-linux-next
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c index 1ca3488..6d97730 100644 --- a/arch/mips/mti-malta/malta-memory.c +++ b/arch/mips/mti-malta/malta-memory.c
@@ -27,7 +27,7 @@ fw_memblock_t * __init fw_getmdesc(int eva) { char *memsize_str, *ememsize_str = NULL, *ptr; - unsigned long memsize, ememsize = 0; + unsigned long memsize = 0, ememsize = 0; static char cmdline[COMMAND_LINE_SIZE] __initdata; int tmp;