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 'topic/jack' into for-linus
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index
bbab7e2
..
1f912d9
100644
(file)
--- a/
arch/ia64/include/asm/dma-mapping.h
+++ b/
arch/ia64/include/asm/dma-mapping.h
@@
-9,6
+9,8
@@
#include <linux/scatterlist.h>
#include <asm/swiotlb.h>
+#define ARCH_HAS_DMA_GET_REQUIRED_MASK
+
struct dma_mapping_ops {
int (*mapping_error)(struct device *dev,
dma_addr_t dma_addr);