From d20f5aa338dc75fb2e7bfb7627d3dfcc81196e69 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Fri, 6 Feb 2009 14:50:08 +1000
Subject: [PATCH] m68k: merge the mmu and non-mmu versions of div64.h

Trivial merge of the mmu and non-mmu versions of div64.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/include/asm/{div64_mm.h => div64.h} | 6 ++++++
 arch/m68k/include/asm/div64_no.h              | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename arch/m68k/include/asm/{div64_mm.h => div64.h} (88%)
 delete mode 100644 arch/m68k/include/asm/div64_no.h

diff --git a/arch/m68k/include/asm/div64_mm.h b/arch/m68k/include/asm/div64.h
similarity index 88%
rename from arch/m68k/include/asm/div64_mm.h
rename to arch/m68k/include/asm/div64.h
index 8243c931b5c..edb66148a71 100644
--- a/arch/m68k/include/asm/div64_mm.h
+++ b/arch/m68k/include/asm/div64.h
@@ -1,6 +1,8 @@
 #ifndef _M68K_DIV64_H
 #define _M68K_DIV64_H
 
+#ifdef CONFIG_MMU
+
 #include <linux/types.h>
 
 /* n = n / base; return rem; */
@@ -25,4 +27,8 @@
 	__rem;							\
 })
 
+#else
+#include <asm-generic/div64.h>
+#endif /* CONFIG_MMU */
+
 #endif /* _M68K_DIV64_H */
diff --git a/arch/m68k/include/asm/div64_no.h b/arch/m68k/include/asm/div64_no.h
deleted file mode 100644
index 6cd978cefb2..00000000000
--- a/arch/m68k/include/asm/div64_no.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
-- 
2.11.4.GIT