Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 685c78716d95..38b041a40db4 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -187,7 +187,7 @@ static inline struct
 dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
                                             dma_addr_t addr,
                                             unsigned int size,
-                                            enum dma_data_direction direction,
+                                            enum dma_transfer_direction direction,
                                             unsigned long flags)
 {
         struct scatterlist sg;
@@ -209,7 +209,7 @@ static inline struct
 dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
                                             dma_addr_t addr,
                                             unsigned int size,
-                                            enum dma_data_direction direction,
+                                            enum dma_transfer_direction direction,
                                             unsigned long flags)
 {
         return NULL;