linux-next: build failure after merge of the sound-asoc tree

[Stephen Rothwell]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/soc-dapm.c: In function 'dapm_kcontrol_data_alloc':
sound/soc/soc-dapm.c:387:4: error: implicit declaration of function 
'snd_soc_dapm_new_control' [-Werror=implicit-function-declaration]
    data->widget = snd_soc_dapm_new_control(widget->dapm,
    ^
sound/soc/soc-dapm.c:387:17: warning: assignment makes pointer from integer 
without a cast
    data->widget = snd_soc_dapm_new_control(widget->dapm,
                 ^
sound/soc/soc-dapm.c: At top level:
sound/soc/soc-dapm.c:3269:1: error: conflicting types for 
'snd_soc_dapm_new_control'
 snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 ^
sound/soc/soc-dapm.c:387:19: note: previous implicit declaration of 
'snd_soc_dapm_new_control' was here
    data->widget = snd_soc_dapm_new_control(widget->dapm,
                   ^

Caused by commit 02aa78abec6e ("ASoC: DAPM: Add APIs to create
individual DAPM controls").

I have used the sound-asoc tree from next-20150601 for today.
-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpxA35fG4Vex.pgp
Description: OpenPGP digital signature