Merge branch 'topic/core' into for-linus

0f4cc16c · Vinod Koul · 242637ba · 95756320 · 0f4cc16c
Commit 0f4cc16c authored Mar 14, 2016 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/linux/dmaengine.h include/linux/dmaengine.h +2 -2

No files found.
--- 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;