diff options
| author | Ley Foon Tan <lftan@altera.com> | 2014-11-20 19:04:41 +0800 |
|---|---|---|
| committer | Ley Foon Tan <lftan@altera.com> | 2014-12-08 12:56:10 +0800 |
| commit | 065a1134c98758f2368bca43cc3895710ed3f81a (patch) | |
| tree | 1302a4c61d697020735c9f6f6e9042cbb7cc2dd3 /arch/nios2/include/asm | |
| parent | 25f232536cb922c470abab4077231907cacf1c3b (diff) | |
| download | linux-stable-065a1134c98758f2368bca43cc3895710ed3f81a.tar.gz linux-stable-065a1134c98758f2368bca43cc3895710ed3f81a.tar.bz2 linux-stable-065a1134c98758f2368bca43cc3895710ed3f81a.zip | |
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 <lftan@altera.com>
Diffstat (limited to 'arch/nios2/include/asm')
| -rw-r--r-- | arch/nios2/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <asm-generic/io.h> - 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 <asm-generic/io.h> + #endif /* _ASM_NIOS2_IO_H */ |