diff options
| author | Tapani <tapani@vmail.me> | 2012-12-31 18:36:24 +0100 |
|---|---|---|
| committer | John Weber <rjohnweber@gmail.com> | 2013-07-28 23:39:02 -0500 |
| commit | 17a9192f88b06174911736bfe78d0698fd0cbd33 (patch) | |
| tree | 7cf2c1ef81b24343a0d478b9e4da6971e2b742a5 | |
| parent | 5b6342ebde5ebf2647645fd10dfdecbac661d8b9 (diff) | |
| download | linux-17a9192f88b06174911736bfe78d0698fd0cbd33.tar.gz | |
Fix compile break when sound is compiled as modules: ssi and esai were both compiled into the same module
and both contain a module_init().
The fix is cleaning up sound/soc/imx/Makefile.
A result is that HDMI config is not assumed always enabled.
(cherry picked from commit 96b71a9a30690f3e4f8fed7e7b92dcbf7fc10a08)
| -rw-r--r-- | sound/soc/imx/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile index cc0a7d997609..4b214d6b21ec 100644 --- a/sound/soc/imx/Makefile +++ b/sound/soc/imx/Makefile @@ -1,13 +1,16 @@ # i.MX Platform Support -snd-soc-imx-objs := imx-ssi.o imx-esai.o imx-hdmi-dai.o hdmi_pcm.o +snd-soc-imx-objs := imx-ssi.o imx-esai.o snd-soc-imx-fiq-objs := imx-pcm-fiq.o -snd-soc-imx-mx2-objs := imx-pcm-dma-mx2.o imx-hdmi-dma.o +snd-soc-imx-mx2-objs := imx-pcm-dma-mx2.o snd-soc-imx-spdif-dai-objs := imx-spdif-dai.o obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o obj-$(CONFIG_SND_MXC_SOC_FIQ) += snd-soc-imx-fiq.o obj-$(CONFIG_SND_MXC_SOC_MX2) += snd-soc-imx-mx2.o obj-$(CONFIG_SND_MXC_SOC_SPDIF_DAI) += snd-soc-imx-spdif-dai.o +obj-$(CONFIG_SND_SOC_IMX_HDMI) += imx-hdmi-dai.o +obj-$(CONFIG_SND_SOC_IMX_HDMI) += imx-hdmi-dma.o +obj-$(CONFIG_SND_SOC_IMX_HDMI) += hdmi_pcm.o # i.MX Machine Support snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o |