From a3ffd8cd8a612026f6f115b00ac076c2549bd030 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Wed, 25 Jul 2007 22:07:20 +1000
Subject: [PATCH] --- yaml --- r: 62883 b: refs/heads/master c:
 5c4f5264d503f0650c954a181b0ba255913bb382 h: refs/heads/master i:   62881:
 2914c993e3c8c9d92ebfdb29cfd26194dc9c4d54   62879:
 9f8b589f405bfd23c812294d9f8383d8e67803bc v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-m68knommu/timex.h | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 493f60c49ddc..38a899bb2d23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36995223872df6642e604aab2be84377a5d12a19
+refs/heads/master: 5c4f5264d503f0650c954a181b0ba255913bb382
diff --git a/trunk/include/asm-m68knommu/timex.h b/trunk/include/asm-m68knommu/timex.h
index 85069998db52..109050f3fe91 100644
--- a/trunk/include/asm-m68knommu/timex.h
+++ b/trunk/include/asm-m68knommu/timex.h
@@ -1 +1,23 @@
-#include <asm-m68k/timex.h>
+/*
+ * 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