From c94266c4b740a49d324babcce7715fe07925a27d Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 26 Oct 2007 17:55:28 +0100 Subject: [PATCH] --- yaml --- r: 72951 b: refs/heads/master c: 5984a2fc7e7c9ab118e78ae9799e98fc4ade40f9 h: refs/heads/master i: 72949: 59b4b9d6bfca3b1e1e482694bb4c676f1a74fdba 72947: 78353ac61859ae5ec51e907c754569117830ebb2 72943: d830a0efcf0ecc12b518cd95501f3941f474ce1f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-netx/xc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bacd3790528c..7afbd86b397b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a80770ce4d8e0e83a32298453c0a8e78444f8184 +refs/heads/master: 5984a2fc7e7c9ab118e78ae9799e98fc4ade40f9 diff --git a/trunk/arch/arm/mach-netx/xc.c b/trunk/arch/arm/mach-netx/xc.c index 172a058ddd66..bd5184fe177c 100644 --- a/trunk/arch/arm/mach-netx/xc.c +++ b/trunk/arch/arm/mach-netx/xc.c @@ -190,15 +190,15 @@ struct xc *request_xc(int xcno, struct device *dev) goto exit; if (!request_mem_region - (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, dev->kobj.name)) + (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(dev->kobj))) goto exit_free; if (!request_mem_region - (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, dev->kobj.name)) + (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(dev->kobj))) goto exit_release_1; if (!request_mem_region - (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, dev->kobj.name)) + (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(dev->kobj))) goto exit_release_2; x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno));