Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux-drm-fsl-dcu.git] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index c15682a2f9dbd743db935ca682be3ba1a669bb63..ad409381f8cca21370f4802b1a5044af2f946b71 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -154,6 +154,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
@@ -206,6 +216,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