From 3a229c71040298f4da3561e4a2351b369f21ff6d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 24 Mar 2009 16:38:22 -0700
Subject: [PATCH] --- yaml --- r: 133428 b: refs/heads/master c:
 dfbc90196dfb9a814e7f2e1f4c47aa425452d313 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/dma/dw_dmac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 34e4777bef2a..9c24facb4381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9591463af7ea3a2d723c7e39c08aa05ad27e7bfc
+refs/heads/master: dfbc90196dfb9a814e7f2e1f4c47aa425452d313
diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c
index a97c07eef7ec..20ad3d26bec2 100644
--- a/trunk/drivers/dma/dw_dmac.c
+++ b/trunk/drivers/dma/dw_dmac.c
@@ -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);