diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/Kconfig | |
| parent | Linux 3.11 (diff) | |
| parent | ASoC: atmel: disable error interrupt (diff) | |
| download | linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.xz linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip | |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 45eeaa9f7fec..5138b8493051 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -26,12 +26,9 @@ if SND_SOC config SND_SOC_AC97_BUS bool -config SND_SOC_DMAENGINE_PCM - bool - config SND_SOC_GENERIC_DMAENGINE_PCM bool - select SND_SOC_DMAENGINE_PCM + select SND_DMAENGINE_PCM # All the supported SoCs source "sound/soc/atmel/Kconfig" |