diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-08 08:41:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-08 08:41:18 +0200 |
| commit | 36db84bb10758e2f160c197d267aad3f03e57045 (patch) | |
| tree | 38214383d36659181ea397e6eec232b012d8ca12 /arch | |
| parent | 43c5a7cb5278a1cba7960bda8876c7182cdca9b5 (diff) | |
| parent | 8d430633b26678da9f0ba85ef1b530a72d68ae96 (diff) | |
| download | barebox-36db84bb10758e2f160c197d267aad3f03e57045.tar.gz barebox-36db84bb10758e2f160c197d267aad3f03e57045.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/io.h | 4 | ||||
| -rw-r--r-- | arch/ppc/include/asm/io.h | 2 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/io.h | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/io.h | 15 |
4 files changed, 21 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 */ diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index df4bc99ec8..5d19679b50 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -61,6 +61,19 @@ BUILDIO(b, b, char) BUILDIO(w, w, short) BUILDIO(l, , int) +#define outb outb +#define outw outw +#define outl outb +#define inb inb +#define inw inw +#define inl inl +#define outsb outsb +#define outsw outsw +#define outsl outsb +#define insb insb +#define insw insw +#define insl insl + #define IO_SPACE_LIMIT 0xffff /* do a tiny io delay */ @@ -69,4 +82,6 @@ static inline void io_delay(void) inb(0x80); } +#include <asm-generic/io.h> + #endif /* __ASM_X86_IO_H */ |