Merge branch 'topic/dma' of...

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

sound/core/Kconfig

@@ -7,7 +7,7 @@ config SND_PCM
 	select SND_TIMER
 
 config SND_DMAENGINE_PCM
-	bool
+	tristate
 
 config SND_HWDEP
 	tristate