upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / ia64 / sn / kernel / sn2 / timer.c

diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c
index d785b9a..92f7404 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
@@ -15,7 +15,6 @@
 #include <asm/hw_irq.h>
 #include <asm/system.h>
 
-#include "shub.h"
 #include <asm/sn/leds.h>
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/clksupport.h>
@@ -25,12 +24,12 @@ static struct time_interpolator sn2_interpolator = {
        .drift = -1,
        .shift = 10,
        .mask = (1LL << 55) - 1,
-       .source = TIME_SOURCE_MMIO64,
-       .addr = RTC_COUNTER_ADDR
+       .source = TIME_SOURCE_MMIO64
 };
 
 void __init sn_timer_init(void)
 {
        sn2_interpolator.frequency = sn_rtc_cycles_per_second;
+       sn2_interpolator.addr = RTC_COUNTER_ADDR;
        register_time_interpolator(&sn2_interpolator);
 }