diff options
| author | Stafford Horne <shorne@gmail.com> | 2020-08-04 08:40:57 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2020-08-06 06:01:47 +0900 |
| commit | 045838bc7f47f142df82a5a95a1ced73d80705e1 (patch) | |
| tree | 26eab2499a593d92c00c049f32d72d3a6f573398 /arch/openrisc | |
| parent | c1d55d50139bea6bfe964458272a93dd899efb83 (diff) | |
| download | linux-045838bc7f47f142df82a5a95a1ced73d80705e1.tar.gz linux-045838bc7f47f142df82a5a95a1ced73d80705e1.tar.bz2 linux-045838bc7f47f142df82a5a95a1ced73d80705e1.zip | |
openrisc: io: Fixup defines and move include to the end
This didn't seem to cause any issues, but while working on fixing up
sparse annotations for OpenRISC I noticed this. This patch moves the
include of asm-generic/io.h to the end of the file. Also, we add
defines of ioremap and iounmap, that way we don't get duplicate
definitions from asm-generic/io.h.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/include/asm/io.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index db02fb2077d9..7d6b4a77b379 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -14,6 +14,8 @@ #ifndef __ASM_OPENRISC_IO_H #define __ASM_OPENRISC_IO_H +#include <linux/types.h> + /* * PCI: can we really do 0 here if we have no port IO? */ @@ -25,9 +27,12 @@ #define PIO_OFFSET 0 #define PIO_MASK 0 -#include <asm-generic/io.h> - +#define ioremap ioremap void __iomem *ioremap(phys_addr_t offset, unsigned long size); + +#define iounmap iounmap extern void iounmap(void *addr); +#include <asm-generic/io.h> + #endif |