diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-10-19 07:37:08 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 06:47:57 -0500 |
commit | 361a541dc2373e57cfa7a63e95fbe448ff5675d4 (patch) | |
tree | 61c77ec712ed48bde8bdbee74af20e132778e91e /arch/m68k/kernel | |
parent | 5717a02becd2f5dae8b11cb5808de4e5369d607c (diff) |
m68knommu: move definition of mach_gettod to where it is used
The mach_gettod function pointer is only called from the time_no.c
code. So move its actual definition to there too. It is currently in
setup_no.c for no particularly good reason.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/setup_no.c | 1 | ||||
-rw-r--r-- | arch/m68k/kernel/time_no.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 2ed8c0fb1517..ca3df0dc7e88 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c | |||
@@ -47,7 +47,6 @@ EXPORT_SYMBOL(memory_end); | |||
47 | char __initdata command_line[COMMAND_LINE_SIZE]; | 47 | char __initdata command_line[COMMAND_LINE_SIZE]; |
48 | 48 | ||
49 | /* machine dependent timer functions */ | 49 | /* machine dependent timer functions */ |
50 | void (*mach_gettod)(int*, int*, int*, int*, int*, int*); | ||
51 | int (*mach_set_clock_mmss)(unsigned long); | 50 | int (*mach_set_clock_mmss)(unsigned long); |
52 | 51 | ||
53 | /* machine dependent reboot functions */ | 52 | /* machine dependent reboot functions */ |
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 @@ | |||
26 | 26 | ||
27 | #define TICK_SIZE (tick_nsec / 1000) | 27 | #define TICK_SIZE (tick_nsec / 1000) |
28 | 28 | ||
29 | /* machine dependent timer functions */ | ||
30 | void (*mach_gettod)(int*, int*, int*, int*, int*, int*); | ||
31 | |||
29 | static inline int set_rtc_mmss(unsigned long nowtime) | 32 | static inline int set_rtc_mmss(unsigned long nowtime) |
30 | { | 33 | { |
31 | if (mach_set_clock_mmss) | 34 | if (mach_set_clock_mmss) |