From ef2ef83b0090beb30292fb99b7f900a55aa1e7a3 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 21 Dec 2010 11:20:45 +0000 Subject: [PATCH] --- yaml --- r: 227201 b: refs/heads/master c: 354e4157d9e1529cf71c7041a22fde2fd113642b h: refs/heads/master i: 227199: c5d96f23dbd409c529d9a8710b8975b6163c22cb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1072f26e773b..e47a39b17a0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56e78dafc4137f86abf6f5f07282afa39ead4056 +refs/heads/master: 354e4157d9e1529cf71c7041a22fde2fd113642b diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index 7b2edd799fb4..2b2107ce93c0 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/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