From 67108445e90be17602e19b3414864a2e0e610ee3 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Thu, 4 Aug 2011 16:41:43 +0100
Subject: [PATCH] --- yaml --- r: 270038 b: refs/heads/master c:
 284dc060084d93f56c2b80b79eac61c653dccd85 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae85e793b1fa..518b84289bf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 009426a0ebd0fc4a230ab2c2295dbc8f7ba7e8dd
+refs/heads/master: 284dc060084d93f56c2b80b79eac61c653dccd85
diff --git a/trunk/arch/arm/mach-s3c64xx/cpu.c b/trunk/arch/arm/mach-s3c64xx/cpu.c
index 374e45e566b8..8dc05763a7eb 100644
--- a/trunk/arch/arm/mach-s3c64xx/cpu.c
+++ b/trunk/arch/arm/mach-s3c64xx/cpu.c
@@ -20,6 +20,7 @@
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 
 #include <mach/hardware.h>
 #include <mach/map.h>
@@ -145,6 +146,7 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
 	/* initialise the io descriptors we need for initialisation */
 	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
 	iotable_init(mach_desc, size);
+	init_consistent_dma_size(SZ_8M);
 
 	idcode = __raw_readl(S3C_VA_SYS + 0x118);
 	if (!idcode) {
diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h b/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h
index 4760cdae1eb6..b704669f95ff 100644
--- a/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h
+++ b/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h
@@ -15,6 +15,4 @@
 
 #define PLAT_PHYS_OFFSET     UL(0x50000000)
 
-#define CONSISTENT_DMA_SIZE	SZ_8M
-
 #endif