diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /sound/oss/uart6850.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'sound/oss/uart6850.c')
| -rw-r--r-- | sound/oss/uart6850.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index be00cf128651..74ae75f9e2dc 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); | |||
| 78 | static void poll_uart6850(unsigned long dummy); | 78 | static void poll_uart6850(unsigned long dummy); |
| 79 | 79 | ||
| 80 | 80 | ||
| 81 | static struct timer_list uart6850_timer = | 81 | static DEFINE_TIMER(uart6850_timer, poll_uart6850, 0, 0); |
| 82 | TIMER_INITIALIZER(poll_uart6850, 0, 0); | ||
| 83 | 82 | ||
| 84 | static void uart6850_input_loop(void) | 83 | static void uart6850_input_loop(void) |
| 85 | { | 84 | { |