Merge branch 'topic/of' into for-linus

Conflicts:
	include/linux/dmaengine.h

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 1b2df59d1d65..93f7992bee5c 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -560,7 +560,7 @@ EXPORT_SYMBOL_GPL(__dma_request_channel);
  * @dev:        pointer to client device structure
  * @name:       slave channel name
  */
-struct dma_chan *dma_request_slave_channel(struct device *dev, char *name)
+struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name)
 {
         /* If device-tree is present get slave info from here */
         if (dev->of_node)