diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:41 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:41 +0800 |
| commit | 25d4beddff1fa677609f340b84ca2ea45f20e3fe (patch) | |
| tree | 27c9679f53e4b1588995bfc84eb5ba2e23254ddd /sound/soc/fsl/Makefile | |
| parent | 845f67dda29211eb740d031b4f889d6e70ab5bd9 (diff) | |
| parent | fcfc4be154e14741ab631710a85b0cdc891a8747 (diff) | |
Merge remote-tracking branch 'origin/audio/fm' into audio/next
* origin/audio/fm: (8 commits)
MLK-11429-21: ASoC: fsl: port si476x machine driver from imx_3.10.y
MLK-11305 radio-si476x: support set V4L2_CID_AUDIO_MUTE CTRL
MLK-22355: mfd: si476x: Use system_freezable_wq instead of system_wq
MLK-10055-2: mfd: si476x-i2c: sound is registered when no FM module attached
MLK-10038-1: mfd: si476x-i2c: Add support of si476x-rev4.0 board
...
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 8be44b869a8f..de1bb892c7aa 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -82,6 +82,7 @@ snd-soc-imx-ak5558-objs := imx-ak5558.o snd-soc-imx-ak4497-objs := imx-ak4497.o snd-soc-imx-micfil-objs := imx-micfil.o snd-soc-imx-dsp-objs := imx-dsp.o +snd-soc-imx-si476x-objs := imx-si476x.o obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o @@ -105,3 +106,4 @@ obj-$(CONFIG_SND_SOC_IMX_AK5558) += snd-soc-imx-ak5558.o obj-$(CONFIG_SND_SOC_IMX_AK4497) += snd-soc-imx-ak4497.o obj-$(CONFIG_SND_SOC_IMX_MICFIL) += snd-soc-imx-micfil.o obj-$(CONFIG_SND_SOC_IMX_DSP) += snd-soc-imx-dsp.o +obj-$(CONFIG_SND_SOC_IMX_SI476X) += snd-soc-imx-si476x.o |