From 122563f09fbd088b7a80e3891728cbc4dad30739 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:28:09 -0400 Subject: [PATCH] --- yaml --- r: 258401 b: refs/heads/master c: 805e88dc40bbcc924797cfcac524931774c6e46c h: refs/heads/master i: 258399: 6370d935aa3e73fc53e2aa02ea3d6f1d472d9d9e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/cm-x2xx.c | 3 +++ trunk/arch/arm/mach-pxa/include/mach/memory.h | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 96b004ffc8f0..086f997386ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7553ee777b513c3bc8f45bb9fc75fb1bbc584ba1 +refs/heads/master: 805e88dc40bbcc924797cfcac524931774c6e46c diff --git a/trunk/arch/arm/mach-pxa/cm-x2xx.c b/trunk/arch/arm/mach-pxa/cm-x2xx.c index a10996782476..bc55d07566ca 100644 --- a/trunk/arch/arm/mach-pxa/cm-x2xx.c +++ b/trunk/arch/arm/mach-pxa/cm-x2xx.c @@ -518,4 +518,7 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX") .init_irq = cmx2xx_init_irq, .timer = &pxa_timer, .init_machine = cmx2xx_init, +#ifdef CONFIG_PCI + .dma_zone_size = SZ_64M, +#endif MACHINE_END diff --git a/trunk/arch/arm/mach-pxa/include/mach/memory.h b/trunk/arch/arm/mach-pxa/include/mach/memory.h index 07734f37f8fd..d05a59727d66 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/memory.h +++ b/trunk/arch/arm/mach-pxa/include/mach/memory.h @@ -17,8 +17,4 @@ */ #define PLAT_PHYS_OFFSET UL(0xa0000000) -#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) -#define ARM_DMA_ZONE_SIZE SZ_64M -#endif - #endif