aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 10:50:22 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 10:50:22 +0000
commitb9c78022b0e65cdca2541be658f0e74138e92ffe (patch)
treee23644c81ea8218b6852645a392e68f98c9775b9 /arch/arm/mach-ixp4xx/include
parent5bed1fb3287dfb1f6cf717ec200b23d3e537c9ae (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/include')
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/dma.h9
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/memory.h1
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 65944f25266..5b7e1a98e98 100644
--- a/arch/arm/mach-ixp4xx/include/mach/dma.h
+++ b/arch/arm/mach-ixp4xx/include/mach/dma.h
@@ -8,12 +8,3 @@
* published by the Free Software Foundation.
*
*/
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#include <asm/memory.h>
-#include <asm/sizes.h>
-
-#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
-
-#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 2e481db0ca5..98f5e5e2098 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);
ixp4xx_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (SZ_64M - 1)
+#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
#endif