]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nios2: add ioremap_nocache declaration before include asm-generic/io.h.
authorGreentime Hu <greentime@andestech.com>
Thu, 1 Mar 2018 02:55:54 +0000 (10:55 +0800)
committerGreentime Hu <greentime@andestech.com>
Fri, 16 Mar 2018 07:45:21 +0000 (15:45 +0800)
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 <greentime@andestech.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
arch/nios2/include/asm/io.h

index ce072ba0f8ddc98d7ca631e20dbc4cd0127dcbbb..9010243077ab5c1c6378d1d0e614423435a33481 100644 (file)
@@ -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