Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[linux-2.6-microblaze.git] / include / sound / snd_wavefront.h

diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index 6231eb5..5505355 100644 (file)
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -29,6 +29,7 @@ struct _snd_wavefront_midi {
        struct snd_rawmidi_substream     *substream_output[2];
        struct snd_rawmidi_substream     *substream_input[2];
        struct timer_list        timer;
+       snd_wavefront_card_t     *timer_card;
         spinlock_t               open;
         spinlock_t               virtual;     /* protects isvirtual */
 };