diff options
author | Vinod Koul | 2011-11-17 10:24:38 +0100 |
---|---|---|
committer | Vinod Koul | 2011-11-17 10:24:57 +0100 |
commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
tree | c5b5856dc88582697997bb10ccacad6fc2535465 /arch/arm/plat-samsung/include | |
parent | pch_dma: Support new device LAPIS Semiconductor ML7831 IOH (diff) | |
parent | USB-renesas: move to dma_transfer_direction (diff) | |
download | kernel-qcow2-linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.gz kernel-qcow2-linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.xz kernel-qcow2-linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.zip |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'arch/arm/plat-samsung/include')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index 4c1a363526cf..12561152fb97 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -17,7 +17,7 @@ struct samsung_dma_prep_info { enum dma_transaction_type cap; - enum dma_data_direction direction; + enum dma_transfer_direction direction; dma_addr_t buf; unsigned long period; unsigned long len; @@ -27,7 +27,7 @@ struct samsung_dma_prep_info { struct samsung_dma_info { enum dma_transaction_type cap; - enum dma_data_direction direction; + enum dma_transfer_direction direction; enum dma_slave_buswidth width; dma_addr_t fifo; struct s3c2410_dma_client *client; |