diff options
| author | Mark Brown <broonie@kernel.org> | 2021-08-06 01:46:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-06 01:46:24 +0100 |
| commit | ddaa1ed52c5da64fe9adf1d5ea6202cda3a53eea (patch) | |
| tree | 119c5b9dcf67841af4a92f3d3a9b5e4efcc4557b /sound/soc/codecs/Makefile | |
| parent | 585fb31c2c3aad38a5add009171d7e3277b76d45 (diff) | |
| parent | e2f6867299ac85ce227eee18be11ce2c4a568447 (diff) | |
| download | linux-ddaa1ed52c5da64fe9adf1d5ea6202cda3a53eea.tar.bz2 | |
Merge some cs42l42 patches into asoc-5.15
Diffstat (limited to 'sound/soc/codecs/Makefile')
| -rw-r--r-- | sound/soc/codecs/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index d656b1405473..8dcea2c4604a 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -585,7 +585,10 @@ obj-$(CONFIG_SND_SOC_WCD_MBHC) += snd-soc-wcd-mbhc.o obj-$(CONFIG_SND_SOC_WCD9335) += snd-soc-wcd9335.o obj-$(CONFIG_SND_SOC_WCD934X) += snd-soc-wcd934x.o obj-$(CONFIG_SND_SOC_WCD938X) += snd-soc-wcd938x.o -obj-$(CONFIG_SND_SOC_WCD938X_SDW) += snd-soc-wcd938x-sdw.o +ifdef CONFIG_SND_SOC_WCD938X_SDW +# avoid link failure by forcing sdw code built-in when needed +obj-$(CONFIG_SND_SOC_WCD938X) += snd-soc-wcd938x-sdw.o +endif obj-$(CONFIG_SND_SOC_WL1273) += snd-soc-wl1273.o obj-$(CONFIG_SND_SOC_WM0010) += snd-soc-wm0010.o obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o |