From f9847004bf94ba5457738cb5e0f868821864ff50 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 16 Mar 2009 17:52:16 +1000
Subject: [PATCH] m68k: merge the non-MMU and MMU versions of param.h

It is trivial to merge the non-MMU and MMU versions of param.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of param.h are not installed).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/include/asm/{param_mm.h => param.h} |  4 ++++
 arch/m68k/include/asm/param_no.h              | 22 ----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 rename arch/m68k/include/asm/{param_mm.h => param.h} (88%)
 delete mode 100644 arch/m68k/include/asm/param_no.h

diff --git a/arch/m68k/include/asm/param_mm.h b/arch/m68k/include/asm/param.h
similarity index 88%
rename from arch/m68k/include/asm/param_mm.h
rename to arch/m68k/include/asm/param.h
index 536a2788835..85c41b75aa7 100644
--- a/arch/m68k/include/asm/param_mm.h
+++ b/arch/m68k/include/asm/param.h
@@ -11,7 +11,11 @@
 #define HZ 100
 #endif
 
+#ifdef __uClinux__
+#define EXEC_PAGESIZE	4096
+#else
 #define EXEC_PAGESIZE	8192
+#endif
 
 #ifndef NOGROUP
 #define NOGROUP		(-1)
diff --git a/arch/m68k/include/asm/param_no.h b/arch/m68k/include/asm/param_no.h
deleted file mode 100644
index 6044397adb6..00000000000
--- a/arch/m68k/include/asm/param_no.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _M68KNOMMU_PARAM_H
-#define _M68KNOMMU_PARAM_H
-
-#ifdef __KERNEL__
-#define HZ CONFIG_HZ
-#define	USER_HZ		HZ
-#define	CLOCKS_PER_SEC	(USER_HZ)
-#endif
-
-#ifndef HZ
-#define HZ	100
-#endif
-
-#define EXEC_PAGESIZE	4096
-
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN	64	/* max length of hostname */
-
-#endif /* _M68KNOMMU_PARAM_H */
-- 
2.11.4.GIT