Merge remote-tracking branch 'asoc/fix/sh' into asoc-next

2013-03-26 14:08:04 +00:00 · 2013-03-26 14:08:04 +00:00 · ff6550104c
parent de7ba0574e 417a1178f1
commit ff6550104c
1 changed files with 2 additions and 2 deletions
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@ -342,8 +342,8 @@ static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd)
 	return 0;
 }

-static struct snd_soc_platform sh7760_soc_platform = {
-	.pcm_ops 	= &camelot_pcm_ops,
+static struct snd_soc_platform_driver sh7760_soc_platform = {
+	.ops		= &camelot_pcm_ops,
 	.pcm_new	= camelot_pcm_new,
 	.pcm_free	= camelot_pcm_free,
 };