diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-06 15:16:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-06 15:49:07 +0100 |
| commit | 6baa4afa04a79d3a12558401cee0e39004ffcbcf (patch) | |
| tree | c432c73c641396b157d9f5c32e281913efa877c7 /sound/soc/fsl/Makefile | |
| parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
| parent | 1927661b1748480692f1fa2c390fe031c86d862a (diff) | |
Merge branch 'fix/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus-uncursedsound-3.8
We need this for fixing build error regressions in soc/fsl.
Diffstat (limited to 'sound/soc/fsl/Makefile')
| -rw-r--r-- | sound/soc/fsl/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index ec1457915d7c..afd34794db53 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -41,10 +41,7 @@ endif obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o -obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o -snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o -obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o -snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o +obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o # i.MX Machine Support snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o |