Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

1 files changed, 14 insertions, 0 deletions

diff --git a/arch/m68k/include/asm/cachectl.h b/arch/m68k/include/asm/cachectl.h
new file mode 100644
index 000000000000..525978e959e3
--- /dev/null
+++ b/arch/m68k/include/asm/cachectl.h
@@ -0,0 +1,14 @@
+#ifndef _M68K_CACHECTL_H
+#define _M68K_CACHECTL_H
+
+/* Definitions for the cacheflush system call.  */
+
+#define FLUSH_SCOPE_LINE    1   /* Flush a cache line */
+#define FLUSH_SCOPE_PAGE    2   /* Flush a page */
+#define FLUSH_SCOPE_ALL     3   /* Flush the whole cache -- superuser only */
+
+#define FLUSH_CACHE_DATA    1   /* Writeback and flush data cache */
+#define FLUSH_CACHE_INSN    2   /* Flush instruction cache */
+#define FLUSH_CACHE_BOTH    3   /* Flush both caches */
+
+#endif /* _M68K_CACHECTL_H */