[ALSA] Fix control/status mmap with shared PCM substream

[pandora-kernel.git] / include / sound / pcm_oss.h

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index fddaddd..c854647 100644 (file)
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -56,8 +56,10 @@ struct snd_pcm_oss_runtime {
        size_t mmap_bytes;
        char *buffer;                           /* vmallocated period */
        size_t buffer_used;                     /* used length from period buffer */
+#ifdef CONFIG_SND_PCM_OSS_PLUGINS
        struct snd_pcm_plugin *plugin_first;
        struct snd_pcm_plugin *plugin_last;
+#endif
        unsigned int prev_hw_ptr_interrupt;
 };
 
@@ -67,14 +69,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_file *file;
+       struct snd_pcm_oss_setup setup;         /* active setup */
 };
 
 struct snd_pcm_oss_stream {
        struct snd_pcm_oss_setup *setup_list;   /* setup list */
-        struct semaphore setup_mutex;
+       struct mutex setup_mutex;
+#ifdef CONFIG_SND_VERBOSE_PROCFS
        struct snd_info_entry *proc_entry;
+#endif
 };
 
 struct snd_pcm_oss {