diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/m68k/kernel/time_no.c | |
| parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/m68k/kernel/time_no.c')
| -rw-r--r-- | arch/m68k/kernel/time_no.c | 3 |
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 @@ | |||
| 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) |