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 'linus' into core/urgent
[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
4200554
..
628670e
100644
(file)
--- a/
arch/arm/include/asm/dma.h
+++ b/
arch/arm/include/asm/dma.h
@@
-1,15
+1,16
@@
#ifndef __ASM_ARM_DMA_H
#define __ASM_ARM_DMA_H
#ifndef __ASM_ARM_DMA_H
#define __ASM_ARM_DMA_H
-#include <asm/memory.h>
-
/*
* 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
ARM_DMA_ZONE_SIZE
-#define MAX_DMA_ADDRESS 0xffffffff
+#ifndef
CONFIG_ZONE_DMA
+#define MAX_DMA_ADDRESS 0xffffffff
UL
#else
#else
-#define MAX_DMA_ADDRESS (PAGE_OFFSET + ARM_DMA_ZONE_SIZE)
+#define MAX_DMA_ADDRESS ({ \
+ extern unsigned long arm_dma_zone_size; \
+ arm_dma_zone_size ? \
+ (PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })
#endif
#ifdef CONFIG_ISA_DMA_API
#endif
#ifdef CONFIG_ISA_DMA_API