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

[deliverable/linux.git] / arch / mips / lasat / ds1603.c

diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
index 52cb1436a12aff59908461f87f9ea114d44c1f63..c6fd96ff118df4477627befc5db24d602a2abd7c 100644 (file)
--- a/arch/mips/lasat/ds1603.c
+++ b/arch/mips/lasat/ds1603.c
@@ -135,7 +135,7 @@ static void rtc_end_op(void)
        lasat_ndelay(1000);
 }
 
-unsigned long read_persistent_clock(void)
+void read_persistent_clock(struct timespec *ts)
 {
        unsigned long word;
        unsigned long flags;
@@ -147,7 +147,8 @@ unsigned long read_persistent_clock(void)
        rtc_end_op();
        spin_unlock_irqrestore(&rtc_lock, flags);
 
-       return word;
+       ts->tv_sec = word;
+       ts->tv_nsec = 0;
 }
 
 int rtc_mips_set_mmss(unsigned long time)