aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/pcm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound/pcm.h')
-rw-r--r--include/sound/pcm.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index f84d84993a31..afaf3e88e086 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -190,7 +190,7 @@ struct snd_pcm_ops {
190 190
191struct snd_pcm_file { 191struct snd_pcm_file {
192 struct snd_pcm_substream *substream; 192 struct snd_pcm_substream *substream;
193 struct snd_pcm_file *next; 193 int no_compat_mmap;
194}; 194};
195 195
196struct snd_pcm_hw_rule; 196struct snd_pcm_hw_rule;
@@ -347,6 +347,7 @@ struct snd_pcm_substream {
347 int number; 347 int number;
348 char name[32]; /* substream name */ 348 char name[32]; /* substream name */
349 int stream; /* stream (direction) */ 349 int stream; /* stream (direction) */
350 char latency_id[20]; /* latency identifier */
350 size_t buffer_bytes_max; /* limit ring buffer size */ 351 size_t buffer_bytes_max; /* limit ring buffer size */
351 struct snd_dma_buffer dma_buffer; 352 struct snd_dma_buffer dma_buffer;
352 unsigned int dma_buf_id; 353 unsigned int dma_buf_id;
@@ -384,7 +385,6 @@ struct snd_pcm_substream {
384 struct snd_info_entry *proc_prealloc_entry; 385 struct snd_info_entry *proc_prealloc_entry;
385#endif 386#endif
386 /* misc flags */ 387 /* misc flags */
387 unsigned int no_mmap_ctrl: 1;
388 unsigned int hw_opened: 1; 388 unsigned int hw_opened: 1;
389}; 389};
390 390
@@ -402,7 +402,6 @@ struct snd_pcm_str {
402 /* -- OSS things -- */ 402 /* -- OSS things -- */
403 struct snd_pcm_oss_stream oss; 403 struct snd_pcm_oss_stream oss;
404#endif 404#endif
405 struct snd_pcm_file *files;
406#ifdef CONFIG_SND_VERBOSE_PROCFS 405#ifdef CONFIG_SND_VERBOSE_PROCFS
407 struct snd_info_entry *proc_root; 406 struct snd_info_entry *proc_root;
408 struct snd_info_entry *proc_info_entry; 407 struct snd_info_entry *proc_info_entry;