mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'origin' into devel
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
This commit is contained in:
commit
ed40d0c472
3099 changed files with 224307 additions and 127823 deletions
|
|
@ -1011,7 +1011,7 @@ static int __init dw_probe(struct platform_device *pdev)
|
|||
dma_writel(dw, CFG, DW_CFG_DMA_EN);
|
||||
|
||||
printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n",
|
||||
pdev->dev.bus_id, dw->dma.chancnt);
|
||||
dev_name(&pdev->dev), dw->dma.chancnt);
|
||||
|
||||
dma_async_device_register(&dw->dma);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue