From 66dc7579cb7be8dfd47e860e3df7a11f521844e8 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Thu, 4 Aug 2011 17:10:14 +0100
Subject: [PATCH] --- yaml --- r: 270047 b: refs/heads/master c:
 97fef8bda9f32a2b1919501122d6bd6871af06dc h: refs/heads/master i:   270045:
 7834e494f47590fc5d950fd74f91282c09a0ca50   270043:
 2471cb0f0f5fed5f27f4c63f2d09dcd44ef988fd   270039:
 83784e571c7ba9fb97636b7597517c2b2c3af260   270031:
 7e5d349980765e9c14e6b52830095bd96c77f282   270015:
 da1c51b67c9fdaa41f6239ff81564b3422654cc6 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mm/dma-mapping.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c7da064c779a..4dfb5f4fc8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b742024026c5214ab9d75db672b8e984526be70
+refs/heads/master: 97fef8bda9f32a2b1919501122d6bd6871af06dc
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
index 5b59ce572877..50be842e89fd 100644
--- a/trunk/arch/arm/mm/dma-mapping.c
+++ b/trunk/arch/arm/mm/dma-mapping.c
@@ -129,11 +129,7 @@ static void __dma_free_buffer(struct page *page, size_t size)
  */
 static pte_t **consistent_pte;
 
-#ifdef CONSISTENT_DMA_SIZE
-#define DEFAULT_CONSISTENT_DMA_SIZE CONSISTENT_DMA_SIZE
-#else
 #define DEFAULT_CONSISTENT_DMA_SIZE SZ_2M
-#endif
 
 unsigned long consistent_base = CONSISTENT_END - DEFAULT_CONSISTENT_DMA_SIZE;