Merge branch 'master'

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

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index d6ec886637db38ae292aa57fd89fb240085d4453..c854647b6f3c9e416db5d4d21872e5f73d5085b0 100644 (file)
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -69,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 {