X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fsound%2Fpcm_oss.h;h=cc4e226f35fd5b07a4c0aebbea8ea282aa1309b7;hb=c66b31f3926165bc1d4128adc97a064dcbab421a;hp=39df2baca18a7df25106e7fa0e9b214120b55d9c;hpb=a2308b7f0838406c346a2b0259ff88c7fcf41e79;p=linux-2.6-omap-h63xx.git

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index 39df2baca18..cc4e226f35f 100644
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -3,7 +3,7 @@
 
 /*
  *  Digital Audio (PCM) - OSS compatibility abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -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;
@@ -75,7 +76,9 @@ struct snd_pcm_oss_substream {
 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 {