From 7834e494f47590fc5d950fd74f91282c09a0ca50 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Thu, 4 Aug 2011 16:35:26 +0100
Subject: [PATCH] --- yaml --- r: 270045 b: refs/heads/master c:
 2d5e975b2194eb1326ea0b90db1e21da7be17708 h: refs/heads/master i:   270043:
 2471cb0f0f5fed5f27f4c63f2d09dcd44ef988fd v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-bcmring/include/mach/memory.h | 5 -----
 trunk/arch/arm/mach-bcmring/mm.c                  | 3 +++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b38b5f54d456..a90e4849f737 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f407c2e38e5f07d2e8f573fc55a5d996568f6e50
+refs/heads/master: 2d5e975b2194eb1326ea0b90db1e21da7be17708
diff --git a/trunk/arch/arm/mach-bcmring/include/mach/memory.h b/trunk/arch/arm/mach-bcmring/include/mach/memory.h
index 15162e4c75f9..8848a5bb3445 100644
--- a/trunk/arch/arm/mach-bcmring/include/mach/memory.h
+++ b/trunk/arch/arm/mach-bcmring/include/mach/memory.h
@@ -25,9 +25,4 @@
 
 #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE
 
-/*
- * Maximum DMA memory allowed is 14M
- */
-#define CONSISTENT_DMA_SIZE (SZ_16M - SZ_2M)
-
 #endif
diff --git a/trunk/arch/arm/mach-bcmring/mm.c b/trunk/arch/arm/mach-bcmring/mm.c
index 0f1c37e4523a..8616876abb9f 100644
--- a/trunk/arch/arm/mach-bcmring/mm.c
+++ b/trunk/arch/arm/mach-bcmring/mm.c
@@ -13,6 +13,7 @@
 *****************************************************************************/
 
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
@@ -53,4 +54,6 @@ void __init bcmring_map_io(void)
 {
 
 	iotable_init(bcmring_io_desc, ARRAY_SIZE(bcmring_io_desc));
+	/* Maximum DMA memory allowed is 14M */
+	init_consistent_dma_size(14 << 20);
 }