From d0578a57d9b3794faaf722b2fc63da98057bdc89 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 8 Jun 2010 07:48:12 -0600
Subject: [PATCH] --- yaml --- r: 204895 b: refs/heads/master c:
 d3571c3acfabb6f3a93b517b75d9b30eb7e8692e h: refs/heads/master i:   204893:
 68774423330c5bbb2d65cf9bfff9411fd58a64b7   204891:
 0e69baf76a077b1d2356b9e297934f44f1144cbb   204887:
 47730b3fb46d6bec0835d0e5cf741bca0a7f594d   204879:
 7a992f47abedb9db74a677e956942857fb03b8ee   204863:
 a56e24aeab4dbd1ac8fd1d855bbc8c4c306c4a43 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/of/address.c | 2 +-
 trunk/drivers/of/irq.c     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0b775e64441..c451d506c354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3930f294d081c9e2a65f137a7d5fb6c161e4aa94
+refs/heads/master: d3571c3acfabb6f3a93b517b75d9b30eb7e8692e
diff --git a/trunk/drivers/of/address.c b/trunk/drivers/of/address.c
index 5c220c3a3acc..fcadb726d4f9 100644
--- a/trunk/drivers/of/address.c
+++ b/trunk/drivers/of/address.c
@@ -549,7 +549,7 @@ static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,
 		r->end = taddr + size - 1;
 	}
 	r->flags = flags;
-	r->name = dev->name;
+	r->name = dev->full_name;
 	return 0;
 }
 
diff --git a/trunk/drivers/of/irq.c b/trunk/drivers/of/irq.c
index 623eb661c629..6cfb307204c3 100644
--- a/trunk/drivers/of/irq.c
+++ b/trunk/drivers/of/irq.c
@@ -340,6 +340,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 	if (r && irq != NO_IRQ) {
 		r->start = r->end = irq;
 		r->flags = IORESOURCE_IRQ;
+		r->name = dev->full_name;
 	}
 
 	return irq;