git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
[muen/linux.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 2b8cd4a6d95831c0efbbb6eab8139e399136ad24..f7ec71e4001e7d6e0eef60abca31fcd1d8710483 100644
(file)
--- a/
arch/ia64/include/asm/dma-mapping.h
+++ b/
arch/ia64/include/asm/dma-mapping.h
@@
-10,8
+10,6
@@
#include <linux/scatterlist.h>
#include <linux/dma-debug.h>
-#define ARCH_HAS_DMA_GET_REQUIRED_MASK
-
extern const struct dma_map_ops *dma_ops;
extern struct ia64_machine_vector ia64_mv;
extern void set_iommu_machvec(void);