Merge remote branch 'alsa/devel' into topic/misc

This commit is contained in:
Takashi Iwai
2010-01-21 14:27:14 +01:00
4 changed files with 17 additions and 12 deletions
+3 -2
View File
@@ -311,8 +311,9 @@ struct snd_pcm_runtime {
struct snd_pcm_mmap_control *control;
/* -- locking / scheduling -- */
unsigned int nowake: 1; /* no wakeup (data-copy in progress) */
wait_queue_head_t sleep;
unsigned int twake: 1; /* do transfer (!poll) wakeup */
wait_queue_head_t sleep; /* poll sleep */
wait_queue_head_t tsleep; /* transfer sleep */
struct fasync_struct *fasync;
/* -- private section -- */