X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Ftimers%2Ftimer.c;h=b2f722efb2d0d909ba87a5490f81bb7cc8c6b19c;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=a3d6a288088b9e108952e1ecf8ebad15d8722ad1;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c
index a3d6a2880..b2f722efb 100644
--- a/arch/i386/kernel/timers/timer.c
+++ b/arch/i386/kernel/timers/timer.c
@@ -12,18 +12,18 @@
  */
 #endif
 /* list of timers, ordered by preference, NULL terminated */
-static struct init_timer_opts* __initdata timers[] = {
+static struct timer_opts* timers[] = {
 #ifdef CONFIG_X86_CYCLONE_TIMER
-	&timer_cyclone_init,
+	&timer_cyclone,
 #endif
 #ifdef CONFIG_HPET_TIMER
-	&timer_hpet_init,
+	&timer_hpet,
 #endif
+	&timer_tsc,
 #ifdef CONFIG_X86_PM_TIMER
-	&timer_pmtmr_init,
+	&timer_pmtmr,
 #endif
-	&timer_tsc_init,
-	&timer_pit_init,
+	&timer_pit,
 	NULL,
 };
 
@@ -49,7 +49,7 @@ void clock_fallback(void)
 /* iterates through the list of timers, returning the first 
  * one that initializes successfully.
  */
-struct timer_opts* __init select_timer(void)
+struct timer_opts* select_timer(void)
 {
 	int i = 0;
 	
@@ -57,7 +57,7 @@ struct timer_opts* __init select_timer(void)
 	while (timers[i]) {
 		if (timers[i]->init)
 			if (timers[i]->init(clock_override) == 0)
-				return timers[i]->opts;
+				return timers[i];
 		++i;
 	}