diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 00:19:52 (GMT) |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 00:19:52 (GMT) |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /arch/sparc/kernel/ioport.c | |
| parent | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (diff) | |
| parent | c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 (diff) | |
| download | linux-fsl-qoriq-18594822fcb01d4b35e05b9018f770a0b4156d1a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 460f72e..f9ff297 100644 --- a/arch/sparc/kernel/ioport.c +++ b/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: |