aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre2011-07-18 15:17:15 -0400
committerNicolas Pitre2011-07-18 15:30:57 -0400
commitfb89fcfb151698776be6c900aec8161b01990e92 (patch)
tree8c6db92fc2373e123a78f299fc7d9c685af10c73
parentfded1ef9c55e30d91508487c45334c8947cc5f7b (diff)
ARM: ARM_DMA_ZONE_SIZE is no more
One less dependency on mach/memory.h. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r--arch/arm/include/asm/dma.h2
-rw-r--r--arch/arm/mm/init.c5
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index fcf15de8cadb..628670e9d7c9 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -1,8 +1,6 @@
#ifndef __ASM_ARM_DMA_H
#define __ASM_ARM_DMA_H
-#include <asm/memory.h>
-
/*
* This is the maximum virtual address which can be DMA'd from.
*/
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 4a8a01e0c3ab..90a38c6baca4 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -28,7 +28,6 @@
#include <asm/sizes.h>
#include <asm/tlb.h>
#include <asm/fixmap.h>
-#include <asm/memory.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -214,11 +213,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn,
#ifdef CONFIG_ZONE_DMA
-#ifdef ARM_DMA_ZONE_SIZE
-unsigned long arm_dma_zone_size = ARM_DMA_ZONE_SIZE;
-#else
unsigned long arm_dma_zone_size __read_mostly;
-#endif
EXPORT_SYMBOL(arm_dma_zone_size);
/*