summaryrefslogtreecommitdiffstats
path: root/drivers/dma/dmaengine.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-05-02 21:52:26 +0530
committerVinod Koul <vinod.koul@intel.com>2013-05-02 21:52:26 +0530
commitb2396f7984ea09e83d489cfca6d5da62cc22945a (patch)
tree43e42015e6279af397ec1358a99afcc280b0cfab /drivers/dma/dmaengine.c
parent42361f20f29021bfee8d9b5f651362dca83fd705 (diff)
parentde61608acf89779c8831aaa1428b6975d49d98c0 (diff)
downloadlinux-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.bz2
Merge branch 'topic/of' into for-linus
Conflicts: include/linux/dmaengine.h Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r--drivers/dma/dmaengine.c2
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)