From 7541e40463fe827669fee20452c543494b083aab Mon Sep 17 00:00:00 2001 From: Greentime Hu Date: Thu, 1 Mar 2018 10:55:54 +0800 Subject: [PATCH 1736/1795] nios2: add ioremap_nocache declaration before include asm-generic/io.h. A commit for the nds32 architecture bootstrap("asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU") will move the ioremap_nocache out of the CONFIG_MMU ifdef. This means that in order to suppress re-definition errors we need to setup #define's before importing asm-generic/io.h. Signed-off-by: Greentime Hu Reviewed-by: Tobias Klauser (cherry picked from commit c601a89115cbc3ccd51468295d28cfae47cc5410) Signed-off-by: Geert Uytterhoeven --- arch/nios2/include/asm/io.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index ce072ba0f8dd..9010243077ab 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -45,6 +45,7 @@ static inline void iounmap(void __iomem *addr) __iounmap(addr); } +#define ioremap_nocache ioremap_nocache #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache -- 2.19.0