From: Ley Foon Tan Date: Thu, 20 Nov 2014 11:04:41 +0000 (+0800) Subject: nios2: move include asm-generic/io.h to end of file X-Git-Tag: MMI-PSA29.97-13-9~11081^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=065a1134c98758f2368bca43cc3895710ed3f81a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git nios2: move include asm-generic/io.h to end of file Move asm-generic/io.h to end of file to override functions like phys_to_virt, virt_to_phys in asm-generic/io.h. This is due to recent commit 9216efaf introduced new way to override functions by checking for the existence of a macro with the same of the function. Signed-off-by: Ley Foon Tan --- diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index 94cd30ae8254..c5cf8ea12ef8 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -24,8 +24,6 @@ #define writew_relaxed(x, addr) writew(x, addr) #define writel_relaxed(x, addr) writel(x, addr) -#include - extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, unsigned long cacheflag); extern void __iounmap(void __iomem *addr); @@ -57,4 +55,6 @@ static inline void iounmap(void __iomem *addr) #define virt_to_phys(vaddr) \ ((unsigned long)((unsigned long)(vaddr) & ~0xE0000000)) +#include + #endif /* _ASM_NIOS2_IO_H */