Merge remote-tracking branch 'regulator/topic/stub' into regulator-next

[~andy/linux] / include / sound / rawmidi.h

diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 2480e7d10dcf9f04c7f1cb8f8ef4fd82414df369..6b14359d9fed92c0872a6f9a88b5280ca9e1a4b4 100644 (file)
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -27,6 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 
 #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
 #include "seq_device.h"
@@ -63,6 +64,7 @@ struct snd_rawmidi_global_ops {
 };
 
 struct snd_rawmidi_runtime {
+       struct snd_rawmidi_substream *substream;
        unsigned int drain: 1,  /* drain stage */
                     oss: 1;    /* OSS compatible mode */
        /* midi stream buffer */
@@ -79,7 +81,7 @@ struct snd_rawmidi_runtime {
        /* event handler (new bytes, input only) */
        void (*event)(struct snd_rawmidi_substream *substream);
        /* defers calls to event [input] or ops->trigger [output] */
-       struct tasklet_struct tasklet;
+       struct work_struct event_work;
        /* private data */
        void *private_data;
        void (*private_free)(struct snd_rawmidi_substream *substream);