diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /drivers/dma | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
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 | ||