projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fe120b b7ae6f3)
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
Conflicts:
sound/soc/omap/Kconfig

1  2 
sound/soc/omap/Kconfig patch | diff1 | diff2 | blob | history

diff --cc sound/soc/omap/Kconfig
index 44b5acf01f3fe0c5826cdff803fe19cd54d59e62,accd0ff0fbfcbc294326384d68ac5b0d48b79d2f..daa78a0095facf5ff35d1eb0b6ca61836b7c9210
--- 1/sound/soc/omap/Kconfig
--- 2/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@@ -1,7 -1,7 +1,7 @@@
  config SND_OMAP_SOC
        tristate "SoC Audio for the Texas Instruments OMAP chips"
 -      depends on ARCH_OMAP && DMA_OMAP
 +      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