Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 285dbbd..4d1b4c5 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -86,8 +86,8 @@ config MEMORY_SIZE
        hex "Physical memory size"
        default "0x08000000" if MACH_G3EVM
        default "0x08000000" if MACH_G4EVM
-       default "0x10000000" if MACH_AP4EVB
        default "0x20000000" if MACH_AG5EVM
+       default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
        default "0x04000000"
        help
          This sets the default memory size assumed by your kernel. It can