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/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 8da685e796d1..e2f22d4b8c3a 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -765,10 +765,10 @@ static void usbhsf_dma_prepare_tasklet(unsigned long data)
         struct dma_async_tx_descriptor *desc;
         struct dma_chan *chan = usbhsf_dma_chan_get(fifo, pkt);
         struct device *dev = usbhs_priv_to_dev(priv);
-        enum dma_data_direction dir;
+        enum dma_transfer_direction dir;
         dma_cookie_t cookie;
 
-        dir = usbhs_pipe_is_dir_in(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+        dir = usbhs_pipe_is_dir_in(pipe) ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV;
 
         sg_init_table(&sg, 1);
         sg_set_page(&sg, virt_to_page(pkt->dma),