From ab68faa739b8d9f8ef93e9f32b4fbfd1df1b15d2 Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Mon, 5 Nov 2007 17:55:24 +0100 Subject: [PATCH] --- yaml --- r: 73355 b: refs/heads/master c: 93e29a2ecaa8372c5bb9b996b8b43e03a7c37f3c h: refs/heads/master i: 73353: b86e0df8499a2dd11cac9507c57bc41a47518262 73351: b696f22243cf78f4d1513d9b886c3fd2472460ea 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 b68b1235ce55..14218e43e210 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c617360afaeeef4bf3768dc0537edfc72ffb2763 +refs/heads/master: 93e29a2ecaa8372c5bb9b996b8b43e03a7c37f3c diff --git a/trunk/arch/arm/mach-netx/xc.c b/trunk/arch/arm/mach-netx/xc.c index bd5184fe177c..ca9c5b61283a 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, kobject_name(dev->kobj))) + (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, kobject_name(dev->kobj))) + (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, kobject_name(dev->kobj))) + (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));