Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / arch / mips / sibyte / swarm / setup.c

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 672e45d..623ffc9 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -87,19 +87,26 @@ enum swarm_rtc_type {
 
 enum swarm_rtc_type swarm_rtc_type;
 
-unsigned long read_persistent_clock(void)
+void read_persistent_clock(struct timespec *ts)
 {
+       unsigned long sec;
+
        switch (swarm_rtc_type) {
        case RTC_XICOR:
-               return xicor_get_time();
+               sec = xicor_get_time();
+               break;
 
        case RTC_M4LT81:
-               return m41t81_get_time();
+               sec = m41t81_get_time();
+               break;
 
        case RTC_NONE:
        default:
-               return mktime(2000, 1, 1, 0, 0, 0);
+               sec = mktime(2000, 1, 1, 0, 0, 0);
+               break;
        }
+       ts->tv_sec = sec;
+       tv->tv_nsec = 0;
 }
 
 int rtc_mips_set_time(unsigned long sec)