From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 21 Dec 2010 11:20:45 +0000 (+0000)
Subject: ARM: mach-shmobile: mackerel: fixup default memory size
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=354e4157d9e1529cf71c7041a22fde2fd113642b;p=deliverable%2Flinux.git

ARM: mach-shmobile: mackerel: fixup default memory size

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 7b2edd799fb4..2b2107ce93c0 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -75,7 +75,7 @@ config MEMORY_SIZE
 	hex "Physical memory size"
 	default "0x08000000" if MACH_G3EVM
 	default "0x08000000" if MACH_G4EVM
-	default "0x10000000" if MACH_AP4EVB
+	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
 	default "0x04000000"
 	help
 	  This sets the default memory size assumed by your kernel. It can