diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-02 18:58:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-02 18:58:04 -0700 |
| commit | f7ce058bb40beb1114206b4557c6b80fa345db30 (patch) | |
| tree | 5036accc42f8787b56769c10db6ea0431bd2222f /include | |
| parent | 0dd934ee58d2f1af1e242ece62f71d444d15cc67 (diff) | |
| parent | e4eaa6be627d2deda18cd1e4cf99fbf97bc12116 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/snd_wavefront.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h index f4b04ddf0b5d..234c81b6db98 100644 --- a/include/sound/snd_wavefront.h +++ b/include/sound/snd_wavefront.h @@ -91,8 +91,9 @@ struct _snd_wavefront { int samples_used; /* how many */ char interrupts_are_midi; /* h/w MPU interrupts enabled ? */ char rom_samples_rdonly; /* can we write on ROM samples */ + spinlock_t irq_lock; wait_queue_head_t interrupt_sleeper; - snd_wavefront_midi_t midi; /* ICS2115 MIDI interface */ + snd_wavefront_midi_t midi; /* ICS2115 MIDI interface */ }; struct _snd_wavefront_card { |