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

[pandora-kernel.git] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index aa96538..a5d8dce 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -16,7 +16,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */

-

 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>


@@ -324,6 +323,7 @@ static void __init omap_common_init_early(void)
 {
        omap2_check_revision();
        omap_ioremap_init();
 {
        omap2_check_revision();
        omap_ioremap_init();

+       omap_init_consistent_dma_size();

 }
 
 static void __init omap_hwmod_init_postsetup(void)
 }
 
 static void __init omap_hwmod_init_postsetup(void)