Merge branch 'devicetree/merge' into devicetree/next

[firefly-linux-kernel-4.4.55.git] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index c15682a2f9dbd743db935ca682be3ba1a669bb63..b413ed05e74deae78fbd97809c99f0fd68f1ee46 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -12,6 +12,9 @@ config SND_HWDEP
 config SND_RAWMIDI
        tristate
 
+config SND_COMPRESS_OFFLOAD
+       tristate
+
 # To be effective this also requires INPUT - users should say:
 #    select SND_JACK if INPUT=y || INPUT=SND
 # to avoid having to force INPUT on.
@@ -206,6 +209,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