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/arm | |
parent | 43c5a7cb5278a1cba7960bda8876c7182cdca9b5 (diff) | |
parent | 8d430633b26678da9f0ba85ef1b530a72d68ae96 (diff) | |
download | barebox-36db84bb10758e2f160c197d267aad3f03e57045.tar.gz barebox-36db84bb10758e2f160c197d267aad3f03e57045.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 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: */ |