diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:28 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:28 -0500 |
| commit | 3352b80075a2dcc3ee6d7270620cba61878bfc05 (patch) | |
| tree | 6254be904ec296f7eb999bd7d3a91dc989cbae35 /sound/soc/cirrus | |
| parent | 6157e734de97f71658b6bd61d1fa1a9574495cd1 (diff) | |
| parent | 6197c34425c3d9a622d3a7031c91104909224a67 (diff) | |
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Diffstat (limited to 'sound/soc/cirrus')
| -rw-r--r-- | sound/soc/cirrus/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig index 2c20f01e1f7e..06f938deda15 100644 --- a/sound/soc/cirrus/Kconfig +++ b/sound/soc/cirrus/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SND_EP93XX_SOC | 1 | config SND_EP93XX_SOC |
| 2 | tristate "SoC Audio support for the Cirrus Logic EP93xx series" | 2 | tristate "SoC Audio support for the Cirrus Logic EP93xx series" |
| 3 | depends on ARCH_EP93XX && SND_SOC | 3 | depends on (ARCH_EP93XX || COMPILE_TEST) && SND_SOC |
| 4 | select SND_SOC_GENERIC_DMAENGINE_PCM | 4 | select SND_SOC_GENERIC_DMAENGINE_PCM |
| 5 | help | 5 | help |
| 6 | Say Y or M if you want to add support for codecs attached to | 6 | Say Y or M if you want to add support for codecs attached to |