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

Commit f75fd965 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix iop32x/iop33x build 



arch/arm/plat-iop/io.c:26: error: conflicting types for '__iop3xx_ioremap'

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

include/asm-arm/arch-iop13xx/io.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


extern void __iomem * __iop13xx_io(unsigned long io_addr);

extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags);

	unsigned int mtype);

extern void __iop13xx_iounmap(void __iomem *addr);



extern u32 iop13xx_atue_mem_base;

include/asm-arm/arch-iop32x/io.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm/hardware.h>



extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags);

	unsigned int mtype);

extern void __iop3xx_iounmap(void __iomem *addr);



#define IO_SPACE_LIMIT		0xffffffff

include/asm-arm/arch-iop33x/io.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm/hardware.h>



extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags);

	unsigned int mtype);

extern void __iop3xx_iounmap(void __iomem *addr);



#define IO_SPACE_LIMIT		0xffffffff