aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/sram.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-05-28 15:41:03 -0700
committerTony Lindgren <tony@atomide.com>2009-05-28 15:41:03 -0700
commitc81592ba1b012d555d0cb7ec711afda89c327469 (patch)
tree44e36c4785fc6169b971922097d7b3941101b3e1 /arch/arm/plat-omap/sram.c
parentc912f7e1eae169aaca333b4c5da3f36c98f2ccb0 (diff)
parent088962c243db42b9c608f30be3e3a05a5b696895 (diff)
Merge branch 'omap-upstream' into for-next
Conflicts: arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/plat-omap/sram.c')
-rw-r--r--arch/arm/plat-omap/sram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 4f0145d2624..bd44d1a9df9 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -38,8 +38,8 @@
#define OMAP1_SRAM_VA VMALLOC_END
#define OMAP2_SRAM_PA 0x40200000
#define OMAP2_SRAM_PUB_PA 0x4020f800
-#define OMAP2_SRAM_VA VMALLOC_END
-#define OMAP2_SRAM_PUB_VA (VMALLOC_END + 0x800)
+#define OMAP2_SRAM_VA 0xe3000000
+#define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800)
#define OMAP3_SRAM_PA 0x40200000
#define OMAP3_SRAM_VA 0xd7000000
#define OMAP3_SRAM_PUB_PA 0x40208000