diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:41:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:41:03 -0400 |
| commit | c81592ba1b012d555d0cb7ec711afda89c327469 (patch) | |
| tree | 44e36c4785fc6169b971922097d7b3941101b3e1 /arch/arm/plat-omap/sram.c | |
| parent | c912f7e1eae169aaca333b4c5da3f36c98f2ccb0 (diff) | |
| parent | 088962c243db42b9c608f30be3e3a05a5b696895 (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.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 @@ | |||
| 38 | #define OMAP1_SRAM_VA VMALLOC_END | 38 | #define OMAP1_SRAM_VA VMALLOC_END |
| 39 | #define OMAP2_SRAM_PA 0x40200000 | 39 | #define OMAP2_SRAM_PA 0x40200000 |
| 40 | #define OMAP2_SRAM_PUB_PA 0x4020f800 | 40 | #define OMAP2_SRAM_PUB_PA 0x4020f800 |
| 41 | #define OMAP2_SRAM_VA VMALLOC_END | 41 | #define OMAP2_SRAM_VA 0xe3000000 |
| 42 | #define OMAP2_SRAM_PUB_VA (VMALLOC_END + 0x800) | 42 | #define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) |
| 43 | #define OMAP3_SRAM_PA 0x40200000 | 43 | #define OMAP3_SRAM_PA 0x40200000 |
| 44 | #define OMAP3_SRAM_VA 0xd7000000 | 44 | #define OMAP3_SRAM_VA 0xd7000000 |
| 45 | #define OMAP3_SRAM_PUB_PA 0x40208000 | 45 | #define OMAP3_SRAM_PUB_PA 0x40208000 |