diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:14 -0400 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/Kconfig | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
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 | |||
| 26 | config SND_SOC_AC97_BUS | 26 | config SND_SOC_AC97_BUS |
| 27 | bool | 27 | bool |
| 28 | 28 | ||
| 29 | config SND_SOC_DMAENGINE_PCM | ||
| 30 | bool | ||
| 31 | |||
| 32 | config SND_SOC_GENERIC_DMAENGINE_PCM | 29 | config SND_SOC_GENERIC_DMAENGINE_PCM |
| 33 | bool | 30 | bool |
| 34 | select SND_SOC_DMAENGINE_PCM | 31 | select SND_DMAENGINE_PCM |
| 35 | 32 | ||
| 36 | # All the supported SoCs | 33 | # All the supported SoCs |
| 37 | source "sound/soc/atmel/Kconfig" | 34 | source "sound/soc/atmel/Kconfig" |