git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
dma.h
diff --git
a/arch/arm/include/asm/dma.h
b/arch/arm/include/asm/dma.h
index
ca51143
..
4200554
100644
(file)
--- a/
arch/arm/include/asm/dma.h
+++ b/
arch/arm/include/asm/dma.h
@@
-6,8
+6,10
@@
/*
* This is the maximum virtual address which can be DMA'd from.
*/
/*
* This is the maximum virtual address which can be DMA'd from.
*/
-#ifndef
MAX_DMA_ADDRESS
+#ifndef
ARM_DMA_ZONE_SIZE
#define MAX_DMA_ADDRESS 0xffffffff
#define MAX_DMA_ADDRESS 0xffffffff
+#else
+#define MAX_DMA_ADDRESS (PAGE_OFFSET + ARM_DMA_ZONE_SIZE)
#endif
#ifdef CONFIG_ISA_DMA_API
#endif
#ifdef CONFIG_ISA_DMA_API