Merge branch 'topic/hda' into for-linus

[cascardo/linux.git] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 475455c..ca6cdf6 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -155,6 +155,16 @@ config SND_DYNAMIC_MINORS
 
          If you are unsure about this, say N here.
 
+config SND_COMPRESS_OFFLOAD
+       tristate "ALSA Compressed audio offload support"
+       default n
+       help
+         If you want support for offloading compressed audio and have such
+         a hardware, then you should say Y here and also to the DSP driver
+         of your platform.
+
+         If you are unsure about this, say N here.
+
 config SND_SUPPORT_OLD_API
        bool "Support old ALSA API"
        default y
@@ -207,6 +217,9 @@ config SND_PCM_XRUN_DEBUG
 config SND_VMASTER
        bool
 
+config SND_KCTL_JACK
+       bool
+
 config SND_DMA_SGBUF
        def_bool y
        depends on X86