Hi all,

On Tue, 10 Mar 2015 13:01:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> sound/soc/codecs/rt5670.c: In function 'is_sys_clk_from_pll':
> sound/soc/codecs/rt5670.c:519:38: error: 'struct snd_soc_dapm_widget' has no member named 'codec'
>   struct snd_soc_codec *codec = source->codec;
>                                       ^
> 
> Caused by commit 485372dc24ca ("ASoC: rt5670: Check sysclk source by
> private data")?

Still getting this.

> sound/soc/codecs/rt5670.c: In function 'rt5670_set_dai_sysclk':
> sound/soc/codecs/rt5670.c:2272:1: error: expected expression before '<<' token
>  <<<<<<< HEAD
>  ^
> sound/soc/codecs/rt5670.c:2284:1: error: expected expression before '>>' token
>  >>>>>>> v4.0-rc3
>  ^
> 
> Oops :-(

This has been fixed.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au