xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/of' into for-linus

Browse Source 
Conflicts:
	include/linux/dmaengine.h

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Vinod Koul
2013-05-02 21:52:26 +05:30
parent 42361f20f2 de61608acf
commit b2396f7984
4 changed files with 37 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/dmaengine.c
View File

@@ -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)