diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:44 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:44 +0800 |
| commit | b7f8883066ed37854ab4d87ca6df8f628dfa0126 (patch) | |
| tree | 743e498f7c6bdcb866b051bbed55ab0ffa0882ba /sound/soc/fsl/Makefile | |
| parent | 2a635fc846224d82fcfa73cfdab969d2a2cfb484 (diff) | |
| parent | 9c3a087b1db3807400723f5c6e9a13e4429cfc3f (diff) | |
Merge remote-tracking branch 'origin/audio/sof' into audio/next
* origin/audio/sof: (21 commits)
ASoC: SOF: Read tplg filename from board descriptor
ASoC: SOF: Update fw_filename from board description
ASoC: SOF: Allow probe to continue when we have an actual codec
ASoC: SOF: Hardcode ignore_machine
ASoC: fsl: Add generic DAI driver
...
Diffstat (limited to 'sound/soc/fsl/Makefile')
| -rw-r--r-- | sound/soc/fsl/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 8b40b170062b..630a39ae8eb0 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -22,6 +22,7 @@ snd-soc-fsl-ssi-y := fsl_ssi.o snd-soc-fsl-ssi-$(CONFIG_DEBUG_FS) += fsl_ssi_dbg.o snd-soc-fsl-spdif-objs := fsl_spdif.o snd-soc-fsl-esai-objs := fsl_esai.o +snd-soc-fsl-dai-objs := fsl_dai.o snd-soc-fsl-micfil-objs := fsl_micfil.o snd-soc-fsl-utils-objs := fsl_utils.o snd-soc-fsl-dma-objs := fsl_dma.o @@ -38,6 +39,7 @@ obj-$(CONFIG_SND_SOC_FSL_SAI) += snd-soc-fsl-sai.o obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o obj-$(CONFIG_SND_SOC_FSL_SPDIF) += snd-soc-fsl-spdif.o obj-$(CONFIG_SND_SOC_FSL_ESAI) += snd-soc-fsl-esai.o +obj-$(CONFIG_SND_SOC_FSL_DAI) += snd-soc-fsl-dai.o obj-$(CONFIG_SND_SOC_FSL_MICFIL) += snd-soc-fsl-micfil.o obj-$(CONFIG_SND_SOC_FSL_UTILS) += snd-soc-fsl-utils.o obj-$(CONFIG_SND_SOC_FSL_HDMI) += snd-soc-fsl-hdmi.o |