diff options
| author | Tony Lindgren | 2009-05-29 00:41:03 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2009-05-29 00:41:03 +0200 |
| commit | c81592ba1b012d555d0cb7ec711afda89c327469 (patch) | |
| tree | 44e36c4785fc6169b971922097d7b3941101b3e1 /arch/arm/plat-omap/sram.c | |
| parent | OMAP1: PM: update and decouple from OMAP2/3 PM core (diff) | |
| parent | ARM: OMAP1: Make 770 LCD work (diff) | |
| download | kernel-qcow2-linux-c81592ba1b012d555d0cb7ec711afda89c327469.tar.gz kernel-qcow2-linux-c81592ba1b012d555d0cb7ec711afda89c327469.tar.xz kernel-qcow2-linux-c81592ba1b012d555d0cb7ec711afda89c327469.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 4f0145d26246..bd44d1a9df9c 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 |