From d20c8322b1f00554ff981a3e6a645d5782716fa4 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 19 Oct 2011 21:37:08 +1000
Subject: [PATCH] --- yaml --- r: 279703 b: refs/heads/master c:
 361a541dc2373e57cfa7a63e95fbe448ff5675d4 h: refs/heads/master i:   279701:
 de5b0dad6258e45932b8e03129153d0eae4e465a   279699:
 e7c4c30d2c34f1b38a3ee09c14ecdef97ab1ccf2   279695:
 30c9c55f9d97e91813b192e76dfd14595c88c525 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/m68k/kernel/setup_no.c | 1 -
 trunk/arch/m68k/kernel/time_no.c  | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5dc499d30d3..9b42fba9d386 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5717a02becd2f5dae8b11cb5808de4e5369d607c
+refs/heads/master: 361a541dc2373e57cfa7a63e95fbe448ff5675d4
diff --git a/trunk/arch/m68k/kernel/setup_no.c b/trunk/arch/m68k/kernel/setup_no.c
index 2ed8c0fb1517..ca3df0dc7e88 100644
--- a/trunk/arch/m68k/kernel/setup_no.c
+++ b/trunk/arch/m68k/kernel/setup_no.c
@@ -47,7 +47,6 @@ EXPORT_SYMBOL(memory_end);
 char __initdata command_line[COMMAND_LINE_SIZE];
 
 /* machine dependent timer functions */
-void (*mach_gettod)(int*, int*, int*, int*, int*, int*);
 int (*mach_set_clock_mmss)(unsigned long);
 
 /* machine dependent reboot functions */
diff --git a/trunk/arch/m68k/kernel/time_no.c b/trunk/arch/m68k/kernel/time_no.c
index 6623909f70e6..3ef0f7768dcd 100644
--- a/trunk/arch/m68k/kernel/time_no.c
+++ b/trunk/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)