summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-10-28 12:47:44 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-10-28 12:47:44 +1100
commitf9b8c785b124512de2a4d93ae71c5ecfa444ac2b (patch)
treeb558c6fcb1fd24d3a4530114ea848ca5e3cb1dc5 /arch/arm
parent1e04b98d5a9e905ff06949a9f5c046469e8cc4a5 (diff)
parent5e4106bd304ee787c418a56b8c4ba85c22529d7a (diff)
Merge remote branch 'omap_dss2/for-next'
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/include/plat/vram.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/vram.h b/arch/arm/plat-omap/include/plat/vram.h
index 0aa4ecd12c7d..b1b137c83728 100644
--- a/arch/arm/plat-omap/include/plat/vram.h
+++ b/arch/arm/plat-omap/include/plat/vram.h
@@ -33,6 +33,7 @@ extern int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr);
extern int omap_vram_reserve(unsigned long paddr, size_t size);
extern void omap_vram_get_info(unsigned long *vram, unsigned long *free_vram,
unsigned long *largest_free_block);
+extern void __iomem *omap_vram_remap(size_t size, unsigned long paddr);
#ifdef CONFIG_OMAP2_VRAM
extern void omap_vram_set_sdram_vram(u32 size, u32 start);