Merge branch 'topic/hdmi' into for-next

2015-05-22 16:04:45 +02:00
parent 6ab97f25ad 9203dd016a
commit 181a152a09
6 changed files with 217 additions and 0 deletions
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -6,6 +6,12 @@ config SND_PCM
 	tristate
 	select SND_TIMER

+config SND_PCM_ELD
+	bool
+
+config SND_PCM_IEC958
+	bool
+
 config SND_DMAENGINE_PCM
 	tristate