---

yaml --- r: 270043 b: refs/heads/master c: d70a596 h: refs/heads/master i: 270041: 98c68b1 270039: 83784e5 v: v3
git-mirror · Aug 22, 2011 · 2471cb0 · 2471cb0
1 parent d91c265
commit 2471cb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd24f903182b3f2cda39d95574e45aa8983e5770
+refs/heads/master: d70a5969e9d52ef1c0e19a1b154785f8e1acba29
diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c
@@ -25,6 +25,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/fsmc.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -92,6 +93,8 @@ static struct map_desc u300_io_desc[] __initdata = {
 void __init u300_map_io(void)
 {
 	iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc));
+	/* We enable a real big DMA buffer if need be. */
+	init_consistent_dma_size(SZ_4M);
 }
 
 /*

diff --git a/trunk/arch/arm/mach-u300/include/mach/memory.h b/trunk/arch/arm/mach-u300/include/mach/memory.h
@@ -34,9 +34,4 @@
 	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
 #endif
 
-/*
- * We enable a real big DMA buffer if need be.
- */
-#define CONSISTENT_DMA_SIZE SZ_4M
-
 #endif