A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' into for-next

Browse source 
Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <[email protected]>
This commit is contained in:
Takashi Iwai 2012-08-20 22:14:26 +02:00
commit ddf83485d7
38 changed files with 250 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/sound/pcm.h
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)
{