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

[linux-2.6] / include / sound / pcm_oss.h

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index 1d522aaa66dfdbc6d1511d90f90da61d5b2f5a7a..1cd4f64cdf31529d60dbb91d7fa74bad6420d4f0 100644 (file)
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -56,6 +56,7 @@ struct snd_pcm_oss_runtime {
        size_t mmap_bytes;
        char *buffer;                           /* vmallocated period */
        size_t buffer_used;                     /* used length from period buffer */
+       struct mutex params_lock;
 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
        struct snd_pcm_plugin *plugin_first;
        struct snd_pcm_plugin *plugin_last;
@@ -69,13 +70,15 @@ struct snd_pcm_oss_file {
 
 struct snd_pcm_oss_substream {
        unsigned oss: 1;                        /* oss mode */
-       struct snd_pcm_oss_setup *setup;                /* active setup */
+       struct snd_pcm_oss_setup setup;         /* active setup */
 };
 
 struct snd_pcm_oss_stream {
        struct snd_pcm_oss_setup *setup_list;   /* setup list */
        struct mutex setup_mutex;
+#ifdef CONFIG_SND_VERBOSE_PROCFS
        struct snd_info_entry *proc_entry;
+#endif
 };
 
 struct snd_pcm_oss {