Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / m68knommu / kernel / time.c

diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index d182b2f722110d098d5e380179b0618298e4b3b4..a90acf5b0cde1812263625843dc348c6ce717f86 100644 (file)
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -69,12 +69,13 @@ static unsigned long read_rtc_mmss(void)
        if ((year += 1900) < 1970)
                year += 100;
 
-       return  mktime(year, mon, day, hour, min, sec);;
+       return  mktime(year, mon, day, hour, min, sec);
 }
 
-unsigned long read_persistent_clock(void)
+void read_persistent_clock(struct timespec *ts)
 {
-       return read_rtc_mmss();
+       ts->tv_sec = read_rtc_mmss();
+       ts->tv_nsec = 0;
 }
 
 int update_persistent_clock(struct timespec now)