From: Vinod Koul Date: Thu, 2 May 2013 16:22:26 +0000 (+0530) Subject: Merge branch 'topic/of' into for-linus X-Git-Tag: upstream/snapshot3+hdmi~5139^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2396f7984ea09e83d489cfca6d5da62cc22945a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'topic/of' into for-linus Conflicts: include/linux/dmaengine.h Signed-off-by: Vinod Koul --- b2396f7984ea09e83d489cfca6d5da62cc22945a diff --cc include/linux/dmaengine.h index dd6d21b,274071c..96d3e4a --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@@ -967,9 -967,8 +967,9 @@@ enum dma_status dma_sync_wait(struct dm #ifdef CONFIG_DMA_ENGINE 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(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); +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)