From af39727f02d2ad286429702d3de29c10b8324a47 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: 133426 b: refs/heads/master c:
 9d6b4c82bffbe6de624ff86cb279166867f46365 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/amba/bus.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 28539a51032e..df044898af21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3ef01ce4f73f41e99b2a5f0796f1f1a1daaaaa2
+refs/heads/master: 9d6b4c82bffbe6de624ff86cb279166867f46365
diff --git a/trunk/drivers/amba/bus.c b/trunk/drivers/amba/bus.c
index 00c46e0b40e4..3d763fdf99b7 100644
--- a/trunk/drivers/amba/bus.c
+++ b/trunk/drivers/amba/bus.c
@@ -210,7 +210,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
 	dev->dev.release = amba_device_release;
 	dev->dev.bus = &amba_bustype;
 	dev->dev.dma_mask = &dev->dma_mask;
-	dev->res.name = dev->dev.bus_id;
+	dev->res.name = dev_name(&dev->dev);
 
 	if (!dev->dev.coherent_dma_mask && dev->dma_mask)
 		dev_warn(&dev->dev, "coherent dma mask is unset\n");
@@ -294,7 +294,7 @@ static int amba_find_match(struct device *dev, void *data)
 	if (d->parent)
 		r &= d->parent == dev->parent;
 	if (d->busid)
-		r &= strcmp(dev->bus_id, d->busid) == 0;
+		r &= strcmp(dev_name(dev), d->busid) == 0;
 
 	if (r) {
 		get_device(dev);