Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/misc

2010-07-05 15:37:27 +02:00
parent b415ec7041 08b4509889
commit 65ee2ba310
3 changed files with 25 additions and 16 deletions
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@ -317,7 +317,7 @@ struct snd_pcm_runtime {
 	struct snd_pcm_mmap_control *control;

 	/* -- locking / scheduling -- */
-	unsigned int twake: 1;		/* do transfer (!poll) wakeup */
+	snd_pcm_uframes_t twake; 	/* do transfer (!poll) wakeup if non-zero */
 	wait_queue_head_t sleep;	/* poll sleep */
 	wait_queue_head_t tsleep;	/* transfer sleep */
 	struct fasync_struct *fasync;