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

[pandora-kernel.git] / arch / avr32 / kernel / time.c

diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index f27aa3b..668ed28 100644 (file)
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -110,17 +110,17 @@ static struct clock_event_device comparator = {
        .set_mode       = comparator_mode,
 };
 
+void read_persistent_clock(struct timespec *ts)
+{
+       ts->tv_sec = mktime(2007, 1, 1, 0, 0, 0);
+       ts->tv_nsec = 0;
+}
+
 void __init time_init(void)
 {
        unsigned long counter_hz;
        int ret;
 
-       xtime.tv_sec = mktime(2007, 1, 1, 0, 0, 0);
-       xtime.tv_nsec = 0;
-
-       set_normalized_timespec(&wall_to_monotonic,
-                               -xtime.tv_sec, -xtime.tv_nsec);
-
        /* figure rate for counter */
        counter_hz = clk_get_rate(boot_cpu_data.clk);
        counter.mult = clocksource_hz2mult(counter_hz, counter.shift);