diff options
| author |   Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 14:54:38 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 14:54:57 +0530 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /include/linux/amba | |
| parent | pch_dma: Support new device LAPIS Semiconductor ML7831 IOH (diff) | |
| parent | USB-renesas: move to dma_transfer_direction (diff) | |
| download | linux-dev-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.xz linux-dev-e0d23ef29ed637dc6bd739f590985746d9ad9caa.zip | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/pl08x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 9eabffbc4e50..033f6aa670de 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h @@ -134,7 +134,7 @@ struct pl08x_txd { struct dma_async_tx_descriptor tx; struct list_head node; struct list_head dsg_list; - enum dma_data_direction direction; + enum dma_transfer_direction direction; dma_addr_t llis_bus; struct pl08x_lli *llis_va; /* Default cctl value for LLIs */ @@ -197,7 +197,7 @@ struct pl08x_dma_chan { dma_addr_t dst_addr; u32 src_cctl; u32 dst_cctl; - enum dma_data_direction runtime_direction; + enum dma_transfer_direction runtime_direction; dma_cookie_t lc; struct list_head pend_list; struct pl08x_txd *at; |