From 2471cb0f0f5fed5f27f4c63f2d09dcd44ef988fd Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Thu, 4 Aug 2011 15:41:42 +0100 Subject: [PATCH] --- yaml --- r: 270043 b: refs/heads/master c: d70a5969e9d52ef1c0e19a1b154785f8e1acba29 h: refs/heads/master i: 270041: 98c68b1f4f7527cfaacfabd30851dbf356cecdb5 270039: 83784e571c7ba9fb97636b7597517c2b2c3af260 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-u300/core.c | 3 +++ trunk/arch/arm/mach-u300/include/mach/memory.h | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f775db7061b2..51637ccd6623 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd24f903182b3f2cda39d95574e45aa8983e5770 +refs/heads/master: d70a5969e9d52ef1c0e19a1b154785f8e1acba29 diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c index 399c89f14dfb..376b6dfdfae9 100644 --- a/trunk/arch/arm/mach-u300/core.c +++ b/trunk/arch/arm/mach-u300/core.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -92,6 +93,8 @@ static struct map_desc u300_io_desc[] __initdata = { void __init u300_map_io(void) { iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc)); + /* We enable a real big DMA buffer if need be. */ + init_consistent_dma_size(SZ_4M); } /* diff --git a/trunk/arch/arm/mach-u300/include/mach/memory.h b/trunk/arch/arm/mach-u300/include/mach/memory.h index 888e2e351ee1..38741da0d261 100644 --- a/trunk/arch/arm/mach-u300/include/mach/memory.h +++ b/trunk/arch/arm/mach-u300/include/mach/memory.h @@ -34,9 +34,4 @@ (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100) #endif -/* - * We enable a real big DMA buffer if need be. - */ -#define CONSISTENT_DMA_SIZE SZ_4M - #endif