From 4fc4652fe1f4a4481f60db2e1b91c78780c8f7c7 Mon Sep 17 00:00:00 2001
From: Martin Habets <errandir_news@mph.eclipse.co.uk>
Date: Sun, 7 May 2006 23:43:19 -0700
Subject: [PATCH] --- yaml --- r: 26683 b: refs/heads/master c:
 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 h: refs/heads/master i:   26681:
 af7c56309b093703a9b64eb94f81670e5b865960   26679:
 7cc5944f8bdf65f88fd0655eed2349f405f51d53 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/kernel/ioport.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d877d791c9da..70e8c9d980a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3426ad6659282d9244d4909e69aa639d0360d0
+refs/heads/master: 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787
diff --git a/trunk/arch/sparc/kernel/ioport.c b/trunk/arch/sparc/kernel/ioport.c
index 460f72e640e6..f9ff29734848 100644
--- a/trunk/arch/sparc/kernel/ioport.c
+++ b/trunk/arch/sparc/kernel/ioport.c
@@ -274,6 +274,11 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
 	if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0)
 		goto err_noiommu;
 
+	/* Set the resource name, if known. */
+	if (sdev) {
+		res->name = sdev->prom_name;
+	}
+
 	return (void *)res->start;
 
 err_noiommu: