summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/io.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2018-06-28 12:18:53 +0300
committerGeert Uytterhoeven <geert@linux-m68k.org>2018-07-29 11:48:18 +0300
commit781c4d6f5f278fc23687d6d224ddb452bb5ac368 (patch)
tree17236b43c50becf77b9068efef1fde074f8e0a68 /arch/m68k/include/asm/io.h
parentab4d391d2756086e34568f0ff84bc4fc7596e685 (diff)
downloadlinux-781c4d6f5f278fc23687d6d224ddb452bb5ac368.tar.xz
m68k/io: Switch mmu variant to <asm-generic/io.h>
The dummy functions defined in <asm/io_mm.h> can be provided by <asm-generic/io.h>. As nommu already uses <asm-generic/io.h>, move its inclusion to <asm/io.h>, and add/adjust include guards where appropriate. This gets rid of lots of "statement with no effect" and "unused variable" warnings when compile-testing. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/io.h')
-rw-r--r--arch/m68k/include/asm/io.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
index ca2849afb087..aabe6420ead2 100644
--- a/arch/m68k/include/asm/io.h
+++ b/arch/m68k/include/asm/io.h
@@ -1,6 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _M68K_IO_H
+#define _M68K_IO_H
+
#if defined(__uClinux__) || defined(CONFIG_COLDFIRE)
#include <asm/io_no.h>
#else
#include <asm/io_mm.h>
#endif
+
+#include <asm-generic/io.h>
+
+#endif /* _M68K_IO_H */