projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/arm64/include/asm/dma-mapping.h
b/arch/arm64/include/asm/dma-mapping.h
index 00a41aab4a37f5b74ca13769b6a57ab8b1145db0..fa6a0c5a8de3e2cc70cb7a5372fc1203b89af383 100644
(file)
--- a/
arch/arm64/include/asm/dma-mapping.h
+++ b/
arch/arm64/include/asm/dma-mapping.h
@@
-23,8
+23,6
@@
#include <asm-generic/dma-coherent.h>
-#define ARCH_HAS_DMA_GET_REQUIRED_MASK
-
#define DMA_ERROR_CODE (~(dma_addr_t)0)
extern struct dma_map_ops *dma_ops;
extern struct dma_map_ops coherent_swiotlb_dma_ops;