diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:17:26 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:17:26 +0530 |
| commit | 0f4cc16c432ef489139a0270913a143c137f7832 (patch) | |
| tree | eecd38ba81b3f9f208a7ee804df968766ab52041 | |
| parent | dmaengine: tegra: Move of_device_id table near to its user (diff) | |
| parent | dmaengine: make slave address physical (diff) | |
| download | wireguard-linux-0f4cc16c432ef489139a0270913a143c137f7832.tar.xz wireguard-linux-0f4cc16c432ef489139a0270913a143c137f7832.zip | |
Merge branch 'topic/core' into for-linus
| -rw-r--r-- | include/linux/dmaengine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 16a1cad30c33..d85ecd20af50 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -357,8 +357,8 @@ enum dma_slave_buswidth { */ struct dma_slave_config { enum dma_transfer_direction direction; - dma_addr_t src_addr; - dma_addr_t dst_addr; + phys_addr_t src_addr; + phys_addr_t dst_addr; enum dma_slave_buswidth src_addr_width; enum dma_slave_buswidth dst_addr_width; u32 src_maxburst; |