Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / arch / arm / include / asm / dma-mapping.h

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index a5821f54e5670a185ea541013ec7e2359089db5b..287466800e4bfd4f1793e8a59d22ef65c86fbd8b 100644 (file)
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -8,13 +8,9 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
-#define        dma_mapping_error(x, y) 0
+#include <linux/dma-direction.h>
 
-enum dma_data_direction {
-       DMA_BIDIRECTIONAL       = 0,
-       DMA_TO_DEVICE           = 1,
-       DMA_FROM_DEVICE         = 2,
-};
+#define        dma_mapping_error(x, y) 0
 
 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {