X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fuart6850.c;h=74ae75f9e2dc40e132a6b5e65a9fd68014698c30;hb=d8b3d7077d08311552643a220f21ce0d30130f59;hp=be00cf128651ef60d3e18fb3e7260ed3ede2659a;hpb=207e0a826fdee4bfe853681aef2175a739c11286;p=linux-2.6.git

diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index be00cf128..74ae75f9e 100644
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -78,8 +78,7 @@ static void (*midi_input_intr) (int dev, unsigned char data);
 static void poll_uart6850(unsigned long dummy);
 
 
-static struct timer_list uart6850_timer =
-		TIMER_INITIALIZER(poll_uart6850, 0, 0);
+static DEFINE_TIMER(uart6850_timer, poll_uart6850, 0, 0);
 
 static void uart6850_input_loop(void)
 {