aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/pcm.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-10 09:32:51 -0400
committerTakashi Iwai <tiwai@suse.de>2009-09-10 09:32:51 -0400
commit6a0f4021469727675b83d85ac91d106bfae0e2c3 (patch)
treec6d7ffd99db592f4b7c294d1a5a7b54284012673 /include/sound/pcm.h
parentf9892a52e2405b4c5fa205d4f18ad292cb7e40bb (diff)
parentb888d1ce82ebd2bafecf64c765754968e78b4228 (diff)
Merge branch 'topic/dummy' into for-linus
* topic/dummy: ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128 ALSA: dummy - Add debug proc file ALSA: Add const prefix to proc helper functions ALSA: Re-export snd_pcm_format_name() function ALSA: dummy - Fake buffer allocations ALSA: dummy - Fix the timer calculation in systimer mode ALSA: dummy - Add more description ALSA: dummy - Better jiffies handling ALSA: dummy - Support high-res timer mode
Diffstat (limited to 'include/sound/pcm.h')
-rw-r--r--include/sound/pcm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 1691c7fe35af..de6d981de5d6 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -988,4 +988,6 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max)
988 988
989#define PCM_RUNTIME_CHECK(sub) snd_BUG_ON(!(sub) || !(sub)->runtime) 989#define PCM_RUNTIME_CHECK(sub) snd_BUG_ON(!(sub) || !(sub)->runtime)
990 990
991const char *snd_pcm_format_name(snd_pcm_format_t format);
992
991#endif /* __SOUND_PCM_H */ 993#endif /* __SOUND_PCM_H */