---

yaml --- r: 270047 b: refs/heads/master c: 97fef8b h: refs/heads/master i: 270045: 7834e49 270043: 2471cb0 270039: 83784e5 270031: 7e5d349 270015: da1c51b v: v3
git-mirror · Aug 22, 2011 · 66dc757 · 66dc757
1 parent 7046cfa
commit 66dc757
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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;