Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / i386 / kernel / timers / timer_cyclone.c

diff --git a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c
index 34f1f3d..13892a6 100644 (file)
--- a/arch/i386/kernel/timers/timer_cyclone.c
+++ b/arch/i386/kernel/timers/timer_cyclone.c
@@ -17,9 +17,9 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/fixmap.h>
-#include "io_ports.h"
+#include <asm/i8253.h>
 
-extern spinlock_t i8253_lock;
+#include "io_ports.h"
 
 /* Number of usecs that the last interrupt was delayed */
 static int delay_at_last_interrupt;
@@ -245,11 +245,15 @@ static void delay_cyclone(unsigned long loops)
 /************************************************************/
 
 /* cyclone timer_opts struct */
-struct timer_opts timer_cyclone = {
+static struct timer_opts timer_cyclone = {
        .name = "cyclone",
-       .init = init_cyclone, 
        .mark_offset = mark_offset_cyclone, 
        .get_offset = get_offset_cyclone,
        .monotonic_clock =      monotonic_clock_cyclone,
        .delay = delay_cyclone,
 };
+
+struct init_timer_opts __initdata timer_cyclone_init = {
+       .init = init_cyclone,
+       .opts = &timer_cyclone,
+};