Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5984a2fc authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix netx_defconfig regression 



Fix:

  CC      arch/arm/mach-netx/xc.o
arch/arm/mach-netx/xc.c: In function 'request_xc':
arch/arm/mach-netx/xc.c:192: error: 'struct kobject' has no member named 'name'
arch/arm/mach-netx/xc.c:196: error: 'struct kobject' has no member named 'name'
arch/arm/mach-netx/xc.c:200: error: 'struct kobject' has no member named 'name'

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a80770ce

arch/arm/mach-netx/xc.c

+3 −3
Original line number Diff line number Diff line
@@ -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));