Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6

[linux-2.6] / sound / oss / uart6850.c

diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index be00cf128651ef60d3e18fb3e7260ed3ede2659a..74ae75f9e2dc40e132a6b5e65a9fd68014698c30 100644 (file)
--- 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)
 {