From 6ae727b2fb49cabdc84b0f5249b8dc0baff2d2f1 Mon Sep 17 00:00:00 2001
From: Philippe De Muyter <phdm@macqel.be>
Date: Wed, 12 Aug 2009 16:35:28 +1000
Subject: [PATCH] --- yaml --- r: 162665 b: refs/heads/master c:
 2756730b798e4f1f8343cf034c33cc730ae3a5d4 h: refs/heads/master i:   162663:
 6434c47cf694b1db07bddda05517a47334e81e0a v: v3

---
 [refs]                              |  2 +-
 trunk/arch/m68k/include/asm/timex.h | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e5984fb0427..94c3dfd3287a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14c16db3906ba9453e9c786323f872e11fd0f48d
+refs/heads/master: 2756730b798e4f1f8343cf034c33cc730ae3a5d4
diff --git a/trunk/arch/m68k/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex.h
index b87f2f278f67..6759dad954f6 100644
--- a/trunk/arch/m68k/include/asm/timex.h
+++ b/trunk/arch/m68k/include/asm/timex.h
@@ -3,10 +3,23 @@
  *
  * m68k architecture timex specifications
  */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
+#ifndef _ASMm68K_TIMEX_H
+#define _ASMm68K_TIMEX_H
 
+#ifdef CONFIG_COLDFIRE
+/*
+ * CLOCK_TICK_RATE should give the underlying frequency of the tick timer
+ * to make ntp work best.  For Coldfires, that's the main clock.
+ */
+#include <asm/coldfire.h>
+#define CLOCK_TICK_RATE	MCF_CLK
+#else
+/*
+ * This default CLOCK_TICK_RATE is probably wrong for many 68k boards
+ * Users of those boards will need to check and modify accordingly
+ */
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+#endif
 
 typedef unsigned long cycles_t;