960115b842
I ran into a build error with CONFIG_SND_SOC_INTEL_COMMON=m and SND_SOC_INTEL_MACH=y: ERROR: "snd_soc_acpi_intel_broadwell_machines" [sound/soc/intel/common/snd-soc-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_haswell_machines" [sound/soc/intel/common/snd-soc-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_cherrytrail_machines" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_baytrail_machines" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! The problem here is that the sound/soc/intel/common/ directory is then entered only for building modules, but the sst-acpi.o never gets built since it depends on a built-in Kconfig symbol. That configuration obviously makes no sense since all options below SND_SOC_INTEL_MACH also depend on something else that in turn depends on CONFIG_SND_SOC_INTEL_COMMON. Adding a SND_SOC_INTEL_SST_TOPLEVEL dependency to SND_SOC_INTEL_MACH solves the build error. I notice we can also consolidate the 'depends on SND_SOC_INTEL_MACH' lines by using an 'if' block to simplify it further and make sure the configuration stays sane. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-By: Vinod Koul <vinod.koul@intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> |
||
---|---|---|
.. | ||
bdw-rt5677.c | ||
broadwell.c | ||
bxt_da7219_max98357a.c | ||
bxt_rt298.c | ||
byt-max98090.c | ||
byt-rt5640.c | ||
bytcht_da7213.c | ||
bytcht_es8316.c | ||
bytcht_nocodec.c | ||
bytcr_rt5640.c | ||
bytcr_rt5651.c | ||
cht_bsw_max98090_ti.c | ||
cht_bsw_rt5645.c | ||
cht_bsw_rt5672.c | ||
haswell.c | ||
kbl_rt5663_max98927.c | ||
kbl_rt5663_rt5514_max98927.c | ||
Kconfig | ||
Makefile | ||
mfld_machine.c | ||
skl_nau88l25_max98357a.c | ||
skl_nau88l25_ssm4567.c | ||
skl_rt286.c |