linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index c854647..fddaddd 100644 (file)
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -56,10 +56,8 @@ 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;
 };
 
@@ -69,15 +67,14 @@ 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_file *file;
 };
 
 struct snd_pcm_oss_stream {
        struct snd_pcm_oss_setup *setup_list;   /* setup list */
-       struct mutex setup_mutex;
-#ifdef CONFIG_SND_VERBOSE_PROCFS
+        struct semaphore setup_mutex;
        struct snd_info_entry *proc_entry;
-#endif
 };
 
 struct snd_pcm_oss {