diff options
author | Nicolas Pitre <nico@fluxnic.net> | 2011-07-18 15:17:15 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-07-18 15:30:57 -0400 |
commit | fb89fcfb151698776be6c900aec8161b01990e92 (patch) | |
tree | 8c6db92fc2373e123a78f299fc7d9c685af10c73 /arch/arm | |
parent | fded1ef9c55e30d91508487c45334c8947cc5f7b (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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/dma.h | 2 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 5 |
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 @@ | |||
1 | #ifndef __ASM_ARM_DMA_H | 1 | #ifndef __ASM_ARM_DMA_H |
2 | #define __ASM_ARM_DMA_H | 2 | #define __ASM_ARM_DMA_H |
3 | 3 | ||
4 | #include <asm/memory.h> | ||
5 | |||
6 | /* | 4 | /* |
7 | * This is the maximum virtual address which can be DMA'd from. | 5 | * This is the maximum virtual address which can be DMA'd from. |
8 | */ | 6 | */ |
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 @@ | |||
28 | #include <asm/sizes.h> | 28 | #include <asm/sizes.h> |
29 | #include <asm/tlb.h> | 29 | #include <asm/tlb.h> |
30 | #include <asm/fixmap.h> | 30 | #include <asm/fixmap.h> |
31 | #include <asm/memory.h> | ||
32 | 31 | ||
33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
@@ -214,11 +213,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn, | |||
214 | 213 | ||
215 | #ifdef CONFIG_ZONE_DMA | 214 | #ifdef CONFIG_ZONE_DMA |
216 | 215 | ||
217 | #ifdef ARM_DMA_ZONE_SIZE | ||
218 | unsigned long arm_dma_zone_size = ARM_DMA_ZONE_SIZE; | ||
219 | #else | ||
220 | unsigned long arm_dma_zone_size __read_mostly; | 216 | unsigned long arm_dma_zone_size __read_mostly; |
221 | #endif | ||
222 | EXPORT_SYMBOL(arm_dma_zone_size); | 217 | EXPORT_SYMBOL(arm_dma_zone_size); |
223 | 218 | ||
224 | /* | 219 | /* |