From c0738806b8977b01ebb858825a9a1f85a216d386 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Thu, 29 Jan 2009 16:28:11 +1000
Subject: [PATCH] --- yaml --- r: 139963 b: refs/heads/master c:
 ebafc17468d58bd903c886175ca84a4edc69ae1d h: refs/heads/master i:   139961:
 4560e1beea11b3cc2f9e3c31c4fc9c833b52e715   139959:
 a1cd24f1d07403402937d8966bffb72810957300 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/include/asm/timex.h    | 21 +++++++++++++++++----
 trunk/arch/m68k/include/asm/timex_mm.h | 18 ------------------
 trunk/arch/m68k/include/asm/timex_no.h | 23 -----------------------
 4 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100644 trunk/arch/m68k/include/asm/timex_mm.h
 delete mode 100644 trunk/arch/m68k/include/asm/timex_no.h

diff --git a/[refs] b/[refs]
index 6f76c3bd965f..181e433c7ec7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34055b806a6334624e7e8af6eefc3aee42372a85
+refs/heads/master: ebafc17468d58bd903c886175ca84a4edc69ae1d
diff --git a/trunk/arch/m68k/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex.h
index 719762980578..b87f2f278f67 100644
--- a/trunk/arch/m68k/include/asm/timex.h
+++ b/trunk/arch/m68k/include/asm/timex.h
@@ -1,5 +1,18 @@
-#ifdef __uClinux__
-#include "timex_no.h"
-#else
-#include "timex_mm.h"
+/*
+ * linux/include/asm-m68k/timex.h
+ *
+ * m68k architecture timex specifications
+ */
+#ifndef _ASMm68k_TIMEX_H
+#define _ASMm68k_TIMEX_H
+
+#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+
+typedef unsigned long cycles_t;
+
+static inline cycles_t get_cycles(void)
+{
+	return 0;
+}
+
 #endif
diff --git a/trunk/arch/m68k/include/asm/timex_mm.h b/trunk/arch/m68k/include/asm/timex_mm.h
deleted file mode 100644
index b87f2f278f67..000000000000
--- a/trunk/arch/m68k/include/asm/timex_mm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * linux/include/asm-m68k/timex.h
- *
- * m68k architecture timex specifications
- */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
-
-#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-	return 0;
-}
-
-#endif
diff --git a/trunk/arch/m68k/include/asm/timex_no.h b/trunk/arch/m68k/include/asm/timex_no.h
deleted file mode 100644
index 109050f3fe91..000000000000
--- a/trunk/arch/m68k/include/asm/timex_no.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * linux/include/asm-m68knommu/timex.h
- *
- * m68knommu architecture timex specifications
- */
-#ifndef _ASM_M68KNOMMU_TIMEX_H
-#define _ASM_M68KNOMMU_TIMEX_H
-
-#ifdef CONFIG_COLDFIRE
-#include <asm/coldfire.h>
-#define CLOCK_TICK_RATE	MCF_CLK
-#else
-#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
-#endif
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-	return 0;
-}
-
-#endif