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/Kconfig | |
| parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
| parent | 1927661b1748480692f1fa2c390fe031c86d862a (diff) | |
| download | linux-6baa4afa04a79d3a12558401cee0e39004ffcbcf.tar.gz linux-6baa4afa04a79d3a12558401cee0e39004ffcbcf.tar.bz2 linux-6baa4afa04a79d3a12558401cee0e39004ffcbcf.zip | |
Merge branch 'fix/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus-uncursed
We need this for fixing build error regressions in soc/fsl.
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index a210c8d7b4bc..3b98159d9645 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -108,13 +108,18 @@ if SND_IMX_SOC config SND_SOC_IMX_SSI tristate -config SND_SOC_IMX_PCM_FIQ +config SND_SOC_IMX_PCM tristate + +config SND_SOC_IMX_PCM_FIQ + bool select FIQ + select SND_SOC_IMX_PCM config SND_SOC_IMX_PCM_DMA - tristate + bool select SND_SOC_DMAENGINE_PCM + select SND_SOC_IMX_PCM config SND_SOC_IMX_AUDMUX tristate |