arch/mips/include/asm/io.h defines arch-specific IOMEM(). The generic definition of IOMEM() should go to asm-generic/io.h because it is a collection of fallback defaults when there is no specific definition in <asm/io.h>. Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> --- include/asm-generic/io.h | 4 ++++ include/common.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 973b8b954..76e6d0dc1 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -420,4 +420,8 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr) #endif #endif /* CONFIG_64BIT */ +#ifndef IOMEM +#define IOMEM(addr) ((void __force __iomem *)(addr)) +#endif + #endif /* __ASM_GENERIC_IO_H */ diff --git a/include/common.h b/include/common.h index 0bf819a6f..ce16ff83a 100644 --- a/include/common.h +++ b/include/common.h @@ -135,8 +135,4 @@ const char *barebox_get_hostname(void); void barebox_set_hostname(const char *); void barebox_set_hostname_no_overwrite(const char *); -#ifndef IOMEM -#define IOMEM(addr) ((void __force __iomem *)(addr)) -#endif - #endif /* __COMMON_H_ */ -- 2.25.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
