From: Mark Brown <broonie@linaro.org>
Date: Thu, 15 Aug 2013 10:37:38 +0000 (+0100)
Subject: Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: next-20130822~64^2~31^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=743c5bb898be45009770c144e5e14e4f448e56b9;p=karo-tx-linux.git

Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap

Conflicts:
	sound/soc/omap/Kconfig
---

743c5bb898be45009770c144e5e14e4f448e56b9
diff --cc sound/soc/omap/Kconfig
index 44b5acf01f3f,accd0ff0fbfc..daa78a0095fa
--- a/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