diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:28:09 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-07-18 15:30:01 -0400 |
| commit | 805e88dc40bbcc924797cfcac524931774c6e46c (patch) | |
| tree | 7cba6f6fcbeb5143d043d597b8b4896d73516328 /arch | |
| parent | 7553ee777b513c3bc8f45bb9fc75fb1bbc584ba1 (diff) | |
| download | op-kernel-dev-805e88dc40bbcc924797cfcac524931774c6e46c.zip op-kernel-dev-805e88dc40bbcc924797cfcac524931774c6e46c.tar.gz | |
ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index a109967..bc55d07 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/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/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 07734f3..d05a597 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/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 |
