X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fsound%2Fpcm_oss.h;h=fddaddde47b4f1803a66216c76394ebdb0c7d80f;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=c854647b6f3c9e416db5d4d21872e5f73d5085b0;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index c854647b6..fddaddde4 100644
--- 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 {