git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
dma.h
diff --git
a/include/asm-arm/dma.h
b/include/asm-arm/dma.h
index
ef41df4
..
49c01e2
100644
(file)
--- a/
include/asm-arm/dma.h
+++ b/
include/asm-arm/dma.h
@@
-9,6
+9,13
@@
typedef unsigned int dmach_t;
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
+/*
+ * This is the maximum virtual address which can be DMA'd from.
+ */
+#ifndef MAX_DMA_ADDRESS
+#define MAX_DMA_ADDRESS 0xffffffff
+#endif
+
/*
* DMA modes
*/
/*
* DMA modes
*/
@@
-91,7
+98,9
@@
extern void set_dma_sg(dmach_t channel, struct scatterlist *sg, int nr_sg);
* especially since some DMA architectures don't update the
* DMA address immediately, but defer it to the enable_dma().
*/
* especially since some DMA architectures don't update the
* DMA address immediately, but defer it to the enable_dma().
*/
-extern void set_dma_addr(dmach_t channel, unsigned long physaddr);
+extern void __set_dma_addr(dmach_t channel, void *addr);
+#define set_dma_addr(channel, addr) \
+ __set_dma_addr(channel, bus_to_virt(addr))
/* Set the DMA byte count for this channel
*
/* Set the DMA byte count for this channel
*