summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/timex.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-01-29 16:28:11 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:42 +1000
commitebafc17468d58bd903c886175ca84a4edc69ae1d (patch)
tree6375005635c94272abb62aac41ec3038c421ea2c /arch/m68k/include/asm/timex.h
parent34055b806a6334624e7e8af6eefc3aee42372a85 (diff)
m68k: use mmu timex.h for non-mmu setups as well
The non-mmu timex.h can be cleaned up and ends up being identical to the mmu timex.h, just just use that. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/timex.h')
-rw-r--r--arch/m68k/include/asm/timex.h21
1 files changed, 17 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h
index 71976298057..b87f2f278f6 100644
--- a/arch/m68k/include/asm/timex.h
+++ b/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