summaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
authorPeter Mamonov <pmamonov@gmail.com>2018-05-22 18:33:36 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2018-05-24 12:45:10 +0200
commit93110ad1c1c6690482a0015ca082d7ddc86b32c4 (patch)
treebb2c4fd20fb5301c470d6894fc5f44c6adb09343 /include/common.h
parentbc6fb02d885d61fab407d6814f0cfebc69b7d07c (diff)
downloadbarebox-93110ad1c1c6690482a0015ca082d7ddc86b32c4.tar.gz
barebox-93110ad1c1c6690482a0015ca082d7ddc86b32c4.tar.xz
include/common.h: move IOMEM declaration for MIPS to arch/mips/include/asm/io.h
Signed-off-by: Peter Mamonov <pmamonov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/common.h b/include/common.h
index 60e5005b8e..f93bd7f5d5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -30,6 +30,7 @@
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <asm/common.h>
+#include <asm/io.h>
#include <printk.h>
/*
@@ -139,11 +140,7 @@ const char *barebox_get_hostname(void);
void barebox_set_hostname(const char *);
void barebox_set_hostname_no_overwrite(const char *);
-#if defined(CONFIG_MIPS)
-#include <asm/addrspace.h>
-
-#define IOMEM(addr) ((void __force __iomem *)CKSEG1ADDR(addr))
-#else
+#ifndef IOMEM
#define IOMEM(addr) ((void __force __iomem *)(addr))
#endif