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

[net-next-2.6.git] / include / sound / pcm.h

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 07fd630db88dab19f1ccbc35e09b90f259843563..304025b235201a82982dc45817f35fb38a21a2ad 100644 (file)
--- 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;