diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:27 +0200 |
| commit | d1ca07111d6214c232b8f419f0daa98c6e0835f6 (patch) | |
| tree | ee3fc1847197d5f161a5d68c9e00f7f6012c3f98 /include | |
| parent | 63a9b9b25701775833f08984347901f4068b6957 (diff) | |
| parent | e1e27870fa8498ce97436f81ff54ba2a41ff6f3f (diff) | |
| download | barebox-d1ca07111d6214c232b8f419f0daa98c6e0835f6.tar.gz barebox-d1ca07111d6214c232b8f419f0daa98c6e0835f6.tar.xz | |
Merge branch 'for-next/mips'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 7 |
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 |