summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shark
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-shark
parent5bed1fb3287dfb1f6cf717ec200b23d3e537c9ae (diff)
downloadlinux-3.10-b9c78022b0e65cdca2541be658f0e74138e92ffe.tar.gz
linux-3.10-b9c78022b0e65cdca2541be658f0e74138e92ffe.tar.bz2
linux-3.10-b9c78022b0e65cdca2541be658f0e74138e92ffe.zip
[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-shark')
-rw-r--r--arch/arm/mach-shark/include/mach/dma.h1
-rw-r--r--arch/arm/mach-shark/include/mach/memory.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/include/mach/dma.h b/arch/arm/mach-shark/include/mach/dma.h
index c0a29bd2a74..dfe1da0e5ac 100644
--- a/arch/arm/mach-shark/include/mach/dma.h
+++ b/arch/arm/mach-shark/include/mach/dma.h
@@ -10,7 +10,6 @@
* The rest is not DMAable. See dev / .properties
* in OpenFirmware.
*/
-#define MAX_DMA_ADDRESS 0xC0400000
#define MAX_DMA_CHANNELS 8
#define DMA_ISA_CASCADE 4
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h
index d00c05eabd5..b497a5868b0 100644
--- a/arch/arm/mach-shark/include/mach/memory.h
+++ b/arch/arm/mach-shark/include/mach/memory.h
@@ -33,6 +33,7 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
__arch_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1)
+#define MAX_DMA_ADDRESS 0xC0400000
#endif