summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/timex_no.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/m68k/include/asm/timex_no.h
parent0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff)
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff)
downloadtalos-obmc-linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.gz
talos-obmc-linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/m68k/include/asm/timex_no.h')
-rw-r--r--arch/m68k/include/asm/timex_no.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/timex_no.h b/arch/m68k/include/asm/timex_no.h
new file mode 100644
index 000000000000..109050f3fe91
--- /dev/null
+++ b/arch/m68k/include/asm/timex_no.h
@@ -0,0 +1,23 @@
+/*
+ * 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
OpenPOWER on IntegriCloud