summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos4/include/mach
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-09-16 11:38:43 +0400
committerKukjin Kim <kgene.kim@samsung.com>2011-09-16 11:38:43 +0400
commitbe6bb8cc8d2bd033a1f89983f2f13bdb3548a08f (patch)
tree2b7f76cc2154e5589a605f97a663c8afe4f6016f /arch/arm/mach-exynos4/include/mach
parentd03c35939d2a447093e60133156217d6512aa9e3 (diff)
parentb02b5da4d15d7f7a250888d003121e1b5b69d00b (diff)
downloadlinux-be6bb8cc8d2bd033a1f89983f2f13bdb3548a08f.tar.xz
Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212
Diffstat (limited to 'arch/arm/mach-exynos4/include/mach')
-rw-r--r--arch/arm/mach-exynos4/include/mach/map.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h
index d32296dc65e2..7073ac730855 100644
--- a/arch/arm/mach-exynos4/include/mach/map.h
+++ b/arch/arm/mach-exynos4/include/mach/map.h
@@ -23,7 +23,8 @@
#include <plat/map-s5p.h>
-#define EXYNOS4_PA_SYSRAM 0x02020000
+#define EXYNOS4_PA_SYSRAM0 0x02025000
+#define EXYNOS4_PA_SYSRAM1 0x02020000
#define EXYNOS4_PA_FIMC0 0x11800000
#define EXYNOS4_PA_FIMC1 0x11810000