diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 13:23:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 13:23:23 +0900 |
| commit | 35eb304b5cd7b49d581bda79218b8134f3b689ea (patch) | |
| tree | 3d75d9ada70814161d035b2f9166fee05d257dfb /include/linux/amba | |
| parent | ca0cc30109241f280eb871794620d7cf198bb582 (diff) | |
| parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
| download | linux-3.10-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.gz linux-3.10-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.bz2 linux-3.10-35eb304b5cd7b49d581bda79218b8134f3b689ea.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus
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 9eabffbc4e5..033f6aa670d 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; |