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

ff655010 · Mark Brown · de7ba057 · 417a1178 · ff655010
Commit ff655010 authored Mar 26, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/sh/dma-sh7760.c sound/soc/sh/dma-sh7760.c +2 -2

No files found.
--- 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 = {
+static struct snd_soc_platform_driver sh7760_soc_platform = {
-	.pcm_ops 	= &camelot_pcm_ops,
+	.ops		= &camelot_pcm_ops,
 	.pcm_new	= camelot_pcm_new,
 	.pcm_free	= camelot_pcm_free,
 };