projects
/
linux-2.6-block.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/iommu
[linux-2.6-block.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 f4d4b1850a7ec0f9ae0ba0257b2d019665412092..abe52575e905c12194efd9ec910a9a86bb879836 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
+
extern struct dma_map_ops *dma_ops;
extern struct ia64_machine_vector ia64_mv;
extern void set_iommu_machvec(void);