Merge branch 'depends/rmk/memory_h' into next/cleanup2

[pandora-kernel.git] / arch / arm / plat-omap / io.c

diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index 1bbcbde..333871f 100644 (file)
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/mm.h>
+#include <linux/dma-mapping.h>
 
 #include <plat/omap7xx.h>
 #include <plat/omap1510.h>
@@ -145,6 +146,13 @@ void omap_iounmap(volatile void __iomem *addr)
 }
 EXPORT_SYMBOL(omap_iounmap);
 
+void __init omap_init_consistent_dma_size(void)
+{
+#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
+       init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
+#endif
+}
+
 void __init omap_ioremap_init(void)
 {
        initialized++;