X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fsys_timer.c;h=c9d04518b1722e95e93fc8c832a89f8df4ea084e;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=6afe29b763b747e5b9b4839e35ccddb03b668b91;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 6afe29b76..c9d04518b 100644
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -28,8 +28,7 @@ static unsigned long prev_event_time;
 
 static void     poll_def_tmr(unsigned long dummy);
 static DEFINE_SPINLOCK(lock);
-
-static struct timer_list def_tmr = TIMER_INITIALIZER(poll_def_tmr, 0, 0);
+static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0);
 
 static unsigned long
 tmr2ticks(int tmr_value)