From f410defcec13acfa8c6e04b8d925157c720580cf Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:28:09 -0400 Subject: [PATCH] --- yaml --- r: 258404 b: refs/heads/master c: fded1ef9c55e30d91508487c45334c8947cc5f7b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shark/core.c | 1 + trunk/arch/arm/mach-shark/include/mach/memory.h | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index feadee89cd78..30e06d3effe7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9107ab623648587a044ee925c1708655bdf9813 +refs/heads/master: fded1ef9c55e30d91508487c45334c8947cc5f7b diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c index 5cf7f94c1f31..ac2873c8014b 100644 --- a/trunk/arch/arm/mach-shark/core.c +++ b/trunk/arch/arm/mach-shark/core.c @@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") .map_io = shark_map_io, .init_irq = shark_init_irq, .timer = &shark_timer, + .dma_zone_size = SZ_4M, MACHINE_END diff --git a/trunk/arch/arm/mach-shark/include/mach/memory.h b/trunk/arch/arm/mach-shark/include/mach/memory.h index 4c0831f83b0c..1cf8d6962617 100644 --- a/trunk/arch/arm/mach-shark/include/mach/memory.h +++ b/trunk/arch/arm/mach-shark/include/mach/memory.h @@ -17,8 +17,6 @@ */ #define PLAT_PHYS_OFFSET UL(0x08000000) -#define ARM_DMA_ZONE_SIZE SZ_4M - /* * Cache flushing area */