diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-10 14:23:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-10 14:23:29 +0100 |
| commit | 7063c88c726a704e648ba36ca78baa630f8b7b0a (patch) | |
| tree | e5bfd784a7d34a5c04005fa4169986921f9fdcd1 /arch/arm/plat-omap/sram.c | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
| parent | 4177662ec9f5e50b69ef074369fdb429dd48d97e (diff) | |
| download | talos-obmc-linux-7063c88c726a704e648ba36ca78baa630f8b7b0a.tar.gz talos-obmc-linux-7063c88c726a704e648ba36ca78baa630f8b7b0a.zip | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
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 4ea73804d21e..2890b11f2387 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -44,9 +44,9 @@ #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_VA 0xe3000000 #define OMAP3_SRAM_PUB_PA 0x40208000 -#define OMAP3_SRAM_PUB_VA 0xd7008000 +#define OMAP3_SRAM_PUB_VA (OMAP3_SRAM_VA + 0x8000) #define OMAP4_SRAM_PA 0x40200000 /*0x402f0000*/ #define OMAP4_SRAM_VA 0xd7000000 /*0xd70f0000*/ |
