diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:24:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:24:12 -0400 |
| commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
| tree | b8d8f98c1af633bbc1570b4270b39727737beebf /drivers/dma | |
| parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dw_dmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index a97c07eef7ec..20ad3d26bec2 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
| @@ -1011,7 +1011,7 @@ static int __init dw_probe(struct platform_device *pdev) | |||
| 1011 | dma_writel(dw, CFG, DW_CFG_DMA_EN); | 1011 | dma_writel(dw, CFG, DW_CFG_DMA_EN); |
| 1012 | 1012 | ||
| 1013 | printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n", | 1013 | printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n", |
| 1014 | pdev->dev.bus_id, dw->dma.chancnt); | 1014 | dev_name(&pdev->dev), dw->dma.chancnt); |
| 1015 | 1015 | ||
| 1016 | dma_async_device_register(&dw->dma); | 1016 | dma_async_device_register(&dw->dma); |
| 1017 | 1017 | ||