summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOleksij Rempel <linux@rempel-privat.de>2017-09-06 16:44:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-09-08 08:25:23 +0200
commit57a79764e96708b8c7989d7eaf94a8e649b1320f (patch)
tree2980e37ec7051142b2057f31b61e303f4bdeafd5 /arch
parent05bc50b854935cea8d0fa54a3386f1ece8235293 (diff)
downloadbarebox-57a79764e96708b8c7989d7eaf94a8e649b1320f.tar.gz
barebox-57a79764e96708b8c7989d7eaf94a8e649b1320f.tar.xz
asm-generic: partially sync io.h with linux kernel
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/io.h4
-rw-r--r--arch/ppc/include/asm/io.h2
-rw-r--r--arch/sandbox/include/asm/io.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index eebf0938b0..d06ff8323f 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -1,10 +1,10 @@
#ifndef __ASM_ARM_IO_H
#define __ASM_ARM_IO_H
-#include <asm-generic/io.h>
-
#define IO_SPACE_LIMIT 0
+#include <asm-generic/io.h>
+
/*
* String version of IO memory access ops:
*/
diff --git a/arch/ppc/include/asm/io.h b/arch/ppc/include/asm/io.h
index f83ab6ee0b..025c06f3b7 100644
--- a/arch/ppc/include/asm/io.h
+++ b/arch/ppc/include/asm/io.h
@@ -244,4 +244,6 @@ void ppcDcbi(unsigned long value);
void ppcSync(void);
void ppcDcbz(unsigned long value);
+#include <asm-generic/io.h>
+
#endif
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index 35b578454e..cb891df5c8 100644
--- a/arch/sandbox/include/asm/io.h
+++ b/arch/sandbox/include/asm/io.h
@@ -1,7 +1,8 @@
#ifndef __ASM_SANDBOX_IO_H
#define __ASM_SANDBOX_IO_H
-#include <asm-generic/io.h>
#define IO_SPACE_LIMIT 0
+#include <asm-generic/io.h>
+
#endif /* __ASM_SANDBOX_IO_H */