Merge branch 'asoc-omap' into for-3.7

This commit is contained in:
Mark Brown 2012-09-05 20:05:11 +08:00
commit 75d8f2931a
647 changed files with 7167 additions and 5274 deletions

View file

@ -1075,7 +1075,8 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max)
const char *snd_pcm_format_name(snd_pcm_format_t format);
/**
* Get a string naming the direction of a stream
* snd_pcm_stream_str - Get a string naming the direction of a stream
* @substream: the pcm substream instance
*/
static inline const char *snd_pcm_stream_str(struct snd_pcm_substream *substream)
{