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/midibuf.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'sound/oss/midibuf.c')
| -rw-r--r-- | sound/oss/midibuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index b2676fa34630..6982556ded56 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c | |||
| @@ -50,7 +50,7 @@ static struct midi_parms parms[MAX_MIDI_DEV]; | |||
| 50 | static void midi_poll(unsigned long dummy); | 50 | static void midi_poll(unsigned long dummy); |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | static struct timer_list poll_timer = TIMER_INITIALIZER(midi_poll, 0, 0); | 53 | static DEFINE_TIMER(poll_timer, midi_poll, 0, 0); |
| 54 | 54 | ||
| 55 | static volatile int open_devs; | 55 | static volatile int open_devs; |
| 56 | static DEFINE_SPINLOCK(lock); | 56 | static DEFINE_SPINLOCK(lock); |