evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'asoc/topic/spear' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2013-04-12 13:57:17 +01:00
commit eeb7f91e35
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/soc/spear/spear_pcm.c
View file

@ -25,7 +25,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/spear_dma.h> #include <sound/spear_dma.h>
struct snd_pcm_hardware spear_pcm_hardware = { static struct snd_pcm_hardware spear_pcm_hardware = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
@ -164,7 +164,7 @@ static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
struct snd_soc_platform_driver spear_soc_platform = { static struct snd_soc_platform_driver spear_soc_platform = {
.ops = &spear_pcm_ops, .ops = &spear_pcm_ops,
.pcm_new = spear_pcm_new, .pcm_new = spear_pcm_new,
.pcm_free = spear_pcm_free, .pcm_free = spear_pcm_free,