diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-05 15:37:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-05 15:37:27 +0200 |
| commit | 65ee2ba3105f6ca3b8814d993682d4f21a1f0d8d (patch) | |
| tree | e08471a6470f6c3a38e839e7d0d42e7d40e837e7 /include/sound | |
| parent | b415ec7041429bb2cde3419e9556049fe12bf27a (diff) | |
| parent | 08b450988905505d12f7671bc24b8da73631d327 (diff) | |
| download | linux-stable-65ee2ba3105f6ca3b8814d993682d4f21a1f0d8d.tar.gz linux-stable-65ee2ba3105f6ca3b8814d993682d4f21a1f0d8d.tar.bz2 linux-stable-65ee2ba3105f6ca3b8814d993682d4f21a1f0d8d.zip | |
Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/misc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 07fd630db88d..304025b23520 100644 --- 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; |