diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:08:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:08:04 -0400 |
| commit | ff6550104ce4a4a388f2ba5ae40ad05939416f13 (patch) | |
| tree | a8aa88edb52a79950e644a398c8ec7de1d09dc58 /sound/soc/sh | |
| parent | de7ba0574e5f771bb56ce3c075b9975d9d2ba0f6 (diff) | |
| parent | 417a1178f1bf3cdc606376b3ded3a22489fbb3eb (diff) | |
Merge remote-tracking branch 'asoc/fix/sh' into asoc-next
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/dma-sh7760.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 19eff8fc4fdd..1a8b03e4b41b 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) | |||
| 342 | return 0; | 342 | return 0; |
| 343 | } | 343 | } |
| 344 | 344 | ||
| 345 | static struct snd_soc_platform sh7760_soc_platform = { | 345 | static struct snd_soc_platform_driver sh7760_soc_platform = { |
| 346 | .pcm_ops = &camelot_pcm_ops, | 346 | .ops = &camelot_pcm_ops, |
| 347 | .pcm_new = camelot_pcm_new, | 347 | .pcm_new = camelot_pcm_new, |
| 348 | .pcm_free = camelot_pcm_free, | 348 | .pcm_free = camelot_pcm_free, |
| 349 | }; | 349 | }; |