diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 12:37:38 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 12:37:38 +0200 |
| commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
| tree | 40fff57c975f89da4a90922c165595840e99093a /sound/soc/omap/Kconfig | |
| parent | ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot) (diff) | |
| parent | ALSA: move dmaengine implementation from ASoC to ALSA core (diff) | |
| download | linux-743c5bb898be45009770c144e5e14e4f448e56b9.tar.xz linux-743c5bb898be45009770c144e5e14e4f448e56b9.zip | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Conflicts:
sound/soc/omap/Kconfig
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 44b5acf01f3f..daa78a0095fa 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -1,7 +1,7 @@ config SND_OMAP_SOC tristate "SoC Audio for the Texas Instruments OMAP chips" depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST) - select SND_SOC_DMAENGINE_PCM + select SND_DMAENGINE_PCM config SND_OMAP_SOC_DMIC tristate |