From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 29 May 2014 13:09:32 +0000 (+0200)
Subject: Merge branch '3.15-fixes' into mips-for-linux-next
X-Git-Tag: next-20140530~108^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fba4f8a8889e66fa61a5b97f37f8a0351bf8ff06;p=karo-tx-linux.git

Merge branch '3.15-fixes' into mips-for-linux-next
---

fba4f8a8889e66fa61a5b97f37f8a0351bf8ff06
diff --cc arch/mips/mti-malta/malta-memory.c
index 1ca34887d990,f2364e419682..6d9773096750
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@@ -26,8 -26,8 +26,8 @@@ unsigned long physical_memsize = 0L
  
  fw_memblock_t * __init fw_getmdesc(int eva)
  {
 -	char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
 -	unsigned long memsize = 0, ememsize __maybe_unused = 0;
 +	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;