aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:08:04 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:08:04 +0000
commitff6550104ce4a4a388f2ba5ae40ad05939416f13 (patch)
treea8aa88edb52a79950e644a398c8ec7de1d09dc58 /sound
parentde7ba0574e5f771bb56ce3c075b9975d9d2ba0f6 (diff)
parent417a1178f1bf3cdc606376b3ded3a22489fbb3eb (diff)
downloadvexpress-lsk-ff6550104ce4a4a388f2ba5ae40ad05939416f13.tar.gz
Merge remote-tracking branch 'asoc/fix/sh' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/dma-sh7760.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index 19eff8fc4fd..1a8b03e4b41 100644
--- 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,
};