diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/amba/pl08x.h | 4 | ||||
| -rw-r--r-- | include/linux/dw_dmac.h | 2 | ||||
| -rw-r--r-- | include/linux/sh_dma.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 9eabffbc4e5..033f6aa670d 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h | |||
| @@ -134,7 +134,7 @@ struct pl08x_txd { | |||
| 134 | struct dma_async_tx_descriptor tx; | 134 | struct dma_async_tx_descriptor tx; |
| 135 | struct list_head node; | 135 | struct list_head node; |
| 136 | struct list_head dsg_list; | 136 | struct list_head dsg_list; |
| 137 | enum dma_data_direction direction; | 137 | enum dma_transfer_direction direction; |
| 138 | dma_addr_t llis_bus; | 138 | dma_addr_t llis_bus; |
| 139 | struct pl08x_lli *llis_va; | 139 | struct pl08x_lli *llis_va; |
| 140 | /* Default cctl value for LLIs */ | 140 | /* Default cctl value for LLIs */ |
| @@ -197,7 +197,7 @@ struct pl08x_dma_chan { | |||
| 197 | dma_addr_t dst_addr; | 197 | dma_addr_t dst_addr; |
| 198 | u32 src_cctl; | 198 | u32 src_cctl; |
| 199 | u32 dst_cctl; | 199 | u32 dst_cctl; |
| 200 | enum dma_data_direction runtime_direction; | 200 | enum dma_transfer_direction runtime_direction; |
| 201 | dma_cookie_t lc; | 201 | dma_cookie_t lc; |
| 202 | struct list_head pend_list; | 202 | struct list_head pend_list; |
| 203 | struct pl08x_txd *at; | 203 | struct pl08x_txd *at; |
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h index 4bfe0a2f7d5..f2c64f92c4a 100644 --- a/include/linux/dw_dmac.h +++ b/include/linux/dw_dmac.h | |||
| @@ -127,7 +127,7 @@ struct dw_cyclic_desc { | |||
| 127 | 127 | ||
| 128 | struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan, | 128 | struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan, |
| 129 | dma_addr_t buf_addr, size_t buf_len, size_t period_len, | 129 | dma_addr_t buf_addr, size_t buf_len, size_t period_len, |
| 130 | enum dma_data_direction direction); | 130 | enum dma_transfer_direction direction); |
| 131 | void dw_dma_cyclic_free(struct dma_chan *chan); | 131 | void dw_dma_cyclic_free(struct dma_chan *chan); |
| 132 | int dw_dma_cyclic_start(struct dma_chan *chan); | 132 | int dw_dma_cyclic_start(struct dma_chan *chan); |
| 133 | void dw_dma_cyclic_stop(struct dma_chan *chan); | 133 | void dw_dma_cyclic_stop(struct dma_chan *chan); |
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index cb2dd118cc0..62ef6938da1 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h | |||
| @@ -30,7 +30,7 @@ struct sh_desc { | |||
| 30 | struct sh_dmae_regs hw; | 30 | struct sh_dmae_regs hw; |
| 31 | struct list_head node; | 31 | struct list_head node; |
| 32 | struct dma_async_tx_descriptor async_tx; | 32 | struct dma_async_tx_descriptor async_tx; |
| 33 | enum dma_data_direction direction; | 33 | enum dma_transfer_direction direction; |
| 34 | dma_cookie_t cookie; | 34 | dma_cookie_t cookie; |
| 35 | size_t partial; | 35 | size_t partial; |
| 36 | int chunks; | 36 | int chunks; |
