summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-10 15:33:00 +0200
committerTakashi Iwai <tiwai@suse.de>2009-09-10 15:33:00 +0200
commit2c0d19a78de1ea5d0e92d86be0b16ccab0feccec (patch)
tree190cfbbe1a465755c575aef23e6c37495a00536c /include/sound
parent05a33e3d6fdca6ae3f645cc7bca9c11a4476e84c (diff)
parent5a53a7640a7af7acf904ed805c6fd1bf9fea829c (diff)
Merge branch 'topic/pcm-drain-nonblock' into for-linus
* topic/pcm-drain-nonblock: ALSA: pcm - Increase protocol version ALSA: pcm - Fix drain behavior in non-blocking mode
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/asound.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 82aed3f47534..1f57bb92eb5a 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -138,7 +138,7 @@ struct snd_hwdep_dsp_image {
* *
*****************************************************************************/
-#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 9)
+#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 10)
typedef unsigned long snd_pcm_uframes_t;
typedef signed long snd_pcm_sframes_t;