These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / core / Kconfig

diff --git a/kernel/sound/core/Kconfig b/kernel/sound/core/Kconfig
index 313f22e..e3e9491 100644 (file)
--- a/kernel/sound/core/Kconfig
+++ b/kernel/sound/core/Kconfig
@@ -4,7 +4,13 @@ config SND_TIMER
 
 config SND_PCM
        tristate
-       select SND_TIMER
+       select SND_TIMER if SND_PCM_TIMER
+
+config SND_PCM_ELD
+       bool
+
+config SND_PCM_IEC958
+       bool
 
 config SND_DMAENGINE_PCM
        tristate
@@ -87,6 +93,17 @@ config SND_PCM_OSS_PLUGINS
           support conversion of channels, formats and rates. It will
           behave like most of new OSS/Free drivers in 2.4/2.6 kernels.
 
+config SND_PCM_TIMER
+       bool "PCM timer interface" if EXPERT
+       default y
+       help
+         If you disable this option, pcm timer will be inavailable, so
+         those stubs used pcm timer (e.g. dmix, dsnoop & co) may work
+         incorrectlly.
+
+         For some embedded device, we may disable it to reduce memory
+         footprint, about 20KB on x86_64 platform.
+
 config SND_SEQUENCER_OSS
        bool "OSS Sequencer API"
        depends on SND_SEQUENCER
@@ -176,9 +193,18 @@ config SND_SUPPORT_OLD_API
          Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3
          or older).
 
+config SND_PROC_FS
+        bool "Sound Proc FS Support" if EXPERT
+        depends on PROC_FS
+        default y
+        help
+          Say 'N' to disable Sound proc FS, which may reduce code size about
+          9KB on x86_64 platform.
+          If unsure say Y.
+
 config SND_VERBOSE_PROCFS
        bool "Verbose procfs contents"
-       depends on PROC_FS
+       depends on SND_PROC_FS
        default y
        help
          Say Y here to include code for verbose procfs contents (provides
@@ -221,9 +247,6 @@ config SND_PCM_XRUN_DEBUG
 config SND_VMASTER
        bool
 
-config SND_KCTL_JACK
-       bool
-
 config SND_DMA_SGBUF
        def_bool y
        depends on X86