From 83784e571c7ba9fb97636b7597517c2b2c3af260 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Thu, 4 Aug 2011 10:46:46 +0100
Subject: [PATCH] --- yaml --- r: 270039 b: refs/heads/master c:
 d9c295ad35ff9305d366ef6f72ee429d4c8fcf76 h: refs/heads/master i:   270037:
 38f2888a5524563c9db70dde89f908bf7073e124   270035:
 a3d813a9da177138b01ff07c8b3bc1609f0f6905   270031:
 7e5d349980765e9c14e6b52830095bd96c77f282 v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-s5p64x0/cpu.c                 | 3 +++
 trunk/arch/arm/mach-s5p64x0/include/mach/memory.h | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 518b84289bf5..32c0d3313ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 284dc060084d93f56c2b80b79eac61c653dccd85
+refs/heads/master: d9c295ad35ff9305d366ef6f72ee429d4c8fcf76
diff --git a/trunk/arch/arm/mach-s5p64x0/cpu.c b/trunk/arch/arm/mach-s5p64x0/cpu.c
index a5c00952ea35..8a938542c54d 100644
--- a/trunk/arch/arm/mach-s5p64x0/cpu.c
+++ b/trunk/arch/arm/mach-s5p64x0/cpu.c
@@ -20,6 +20,7 @@
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -111,6 +112,7 @@ void __init s5p6440_map_io(void)
 
 	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
 	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
+	init_consistent_dma_size(SZ_8M);
 }
 
 void __init s5p6450_map_io(void)
@@ -120,6 +122,7 @@ void __init s5p6450_map_io(void)
 
 	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
 	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
+	init_consistent_dma_size(SZ_8M);
 }
 
 /*
diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h b/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h
index 365a6eb4b88f..b14cbc3f521b 100644
--- a/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h
+++ b/trunk/arch/arm/mach-s5p64x0/include/mach/memory.h
@@ -14,6 +14,5 @@
 #define __ASM_ARCH_MEMORY_H __FILE__
 
 #define PLAT_PHYS_OFFSET		UL(0x20000000)
-#define CONSISTENT_DMA_SIZE	SZ_8M
 
 #endif /* __ASM_ARCH_MEMORY_H */