summaryrefslogtreecommitdiffstats
path: root/include/linux/dmaengine.h
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 /include/linux/dmaengine.h
parent42361f20f29021bfee8d9b5f651362dca83fd705 (diff)
parentde61608acf89779c8831aaa1428b6975d49d98c0 (diff)
downloadlinux-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.gz
linux-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.bz2
linux-b2396f7984ea09e83d489cfca6d5da62cc22945a.zip
Merge branch 'topic/of' into for-linus
Conflicts: include/linux/dmaengine.h Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r--include/linux/dmaengine.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index dd6d21b335c8..96d3e4ab11a9 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -969,7 +969,7 @@ enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
void dma_issue_pending_all(void);
struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
dma_filter_fn fn, void *fn_param);
-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);
void dma_release_channel(struct dma_chan *chan);
#else
static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
@@ -985,7 +985,7 @@ static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
return NULL;
}
static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
- char *name)
+ const char *name)
{
return NULL;
}