diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 05:50:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 05:50:22 -0500 |
commit | b9c78022b0e65cdca2541be658f0e74138e92ffe (patch) | |
tree | e23644c81ea8218b6852645a392e68f98c9775b9 /arch/arm/mach-ixp4xx | |
parent | 5bed1fb3287dfb1f6cf717ec200b23d3e537c9ae (diff) |
[ARM] move MAX_DMA_ADDRESS to mach/memory.h
Move the definition of MAX_DMA_ADDRESS from mach/dma.h to mach/memory.h,
thereby placing it along side its relative, ISA_DMA_THRESHOLD.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/dma.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/memory.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h index 65944f252664..5b7e1a98e987 100644 --- a/arch/arm/mach-ixp4xx/include/mach/dma.h +++ b/arch/arm/mach-ixp4xx/include/mach/dma.h | |||
@@ -8,12 +8,3 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | #ifndef __ASM_ARCH_DMA_H | ||
12 | #define __ASM_ARCH_DMA_H | ||
13 | |||
14 | #include <asm/memory.h> | ||
15 | #include <asm/sizes.h> | ||
16 | |||
17 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
18 | |||
19 | #endif /* _ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index 2e481db0ca58..98f5e5e20980 100644 --- a/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h | |||
@@ -22,6 +22,7 @@ void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); | |||
22 | ixp4xx_adjust_zones(node, size, holes) | 22 | ixp4xx_adjust_zones(node, size, holes) |
23 | 23 | ||
24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) | 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) |
25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
25 | 26 | ||
26 | #endif | 27 | #endif |
27 | 28 | ||