lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap-upstream' into for-next

Browse Source 
Conflicts:
	arch/arm/mach-omap2/Makefile
This commit is contained in:
Tony Lindgren
2009-05-28 15:41:03 -07:00
parent c912f7e1ea 088962c243
commit c81592ba1b
21 changed files with 915 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/plat-omap/sram.c
View File

@@ -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