summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/time_no.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
commitb675b3667f6729dcd1036a2a129b35445947f905 (patch)
tree0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /arch/m68k/kernel/time_no.c
parentInput: max8925_onkey - avoid accessing input device too early (diff)
parentLinux 3.3-rc6 (diff)
downloadlinux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz
linux-b675b3667f6729dcd1036a2a129b35445947f905.zip
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'arch/m68k/kernel/time_no.c')
-rw-r--r--arch/m68k/kernel/time_no.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/kernel/time_no.c b/arch/m68k/kernel/time_no.c
index 6623909f70e6..3ef0f7768dcd 100644
--- a/arch/m68k/kernel/time_no.c
+++ b/arch/m68k/kernel/time_no.c
@@ -26,6 +26,9 @@
#define TICK_SIZE (tick_nsec / 1000)
+/* machine dependent timer functions */
+void (*mach_gettod)(int*, int*, int*, int*, int*, int*);
+
static inline int set_rtc_mmss(unsigned long nowtime)
{
if (mach_set_clock_mmss)