summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/time_no.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-01-28 20:52:40 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-01-28 20:52:40 +0100
commitb20f86625de738658c74f2ecfe4050416d2252cc (patch)
treeb84216b70bd923409217834a953f983700e39eda /arch/m68k/kernel/time_no.c
parentatmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume (diff)
parentLinux 3.3-rc1 (diff)
downloadlinux-b20f86625de738658c74f2ecfe4050416d2252cc.tar.xz
linux-b20f86625de738658c74f2ecfe4050416d2252cc.zip
Merge commit 'v3.3-rc1' into fbdev-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)