Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index e0dd38a..b292752 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -1,16 +1,20 @@
 # ALSA soundcard-configuration
 config SND_TIMER
        tristate
+       depends on SND
 
 config SND_PCM
        tristate
        select SND_TIMER
+       depends on SND
 
 config SND_HWDEP
        tristate
+       depends on SND
 
 config SND_RAWMIDI
        tristate
+       depends on SND
 
 config SND_SEQUENCER
        tristate "Sequencer support"
@@ -40,6 +44,7 @@ config SND_SEQ_DUMMY
 
 config SND_OSSEMUL
        bool
+       depends on SND
 
 config SND_MIXER_OSS
        tristate "OSS Mixer API"
@@ -68,9 +73,18 @@ config SND_PCM_OSS
          To compile this driver as a module, choose M here: the module
          will be called snd-pcm-oss.
 
+config SND_PCM_OSS_PLUGINS
+       bool "OSS PCM (digital audio) API - Include plugin system"
+       depends on SND_PCM_OSS
+        default y
+       help
+          If you disable this option, the ALSA's OSS PCM API will not
+          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_SEQUENCER_OSS
        bool "OSS Sequencer API"
-       depends on SND_SEQUENCER
+       depends on SND && SND_SEQUENCER
        select SND_OSSEMUL
        help
          Say Y here to enable OSS sequencer emulation (both
@@ -78,22 +92,9 @@ config SND_SEQUENCER_OSS
 
          Many programs still use the OSS API, so say Y.
 
-         To compile this driver as a module, choose M here: the module
-         will be called snd-seq-oss.
-
-config SND_BIT32_EMUL
-       tristate "Emulation for 32-bit applications"
-       depends on SND && COMPAT
-       select SND_PCM
-       select SND_RAWMIDI
-       select SND_TIMER
-       select SND_HWDEP
-       help
-         Say Y here to enable the emulation for 32-bit ALSA-native
-         applications.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-ioctl32.
+         If you choose M in "Sequencer support" (SND_SEQUENCER),
+         this will be compiled as a module. The module will be called
+         snd-seq-oss.
 
 config SND_RTCTIMER
        tristate "RTC Timer support"
@@ -108,6 +109,46 @@ config SND_RTCTIMER
          To compile this driver as a module, choose M here: the module
          will be called snd-rtctimer.
 
+config SND_SEQ_RTCTIMER_DEFAULT
+       bool "Use RTC as default sequencer timer"
+       depends on SND_RTCTIMER && SND_SEQUENCER
+       default y
+       help
+         Say Y here to use the RTC timer as the default sequencer
+         timer.  This is strongly recommended because it ensures
+         precise MIDI timing even when the system timer runs at less
+         than 1000 Hz.
+
+         If in doubt, say Y.
+
+config SND_DYNAMIC_MINORS
+       bool "Dynamic device file minor numbers"
+       depends on SND
+       help
+         If you say Y here, the minor numbers of ALSA device files in
+         /dev/snd/ are allocated dynamically.  This allows you to have
+         more than 8 sound cards, but requires a dynamic device file
+         system like udev.
+
+         If you are unsure about this, say N here.
+
+config SND_SUPPORT_OLD_API
+       bool "Support old ALSA API"
+       depends on SND
+       default y
+       help
+         Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3
+         or older).
+
+config SND_VERBOSE_PROCFS
+       bool "Verbose procfs contents"
+       depends on SND && PROC_FS
+       default y
+       help
+         Say Y here to include code for verbose procfs contents (provides
+          usefull information to developers when a problem occurs). On the
+          other side, it makes the ALSA subsystem larger.
+
 config SND_VERBOSE_PRINTK
        bool "Verbose printk"
        depends on SND
@@ -124,12 +165,6 @@ config SND_DEBUG
        help
          Say Y here to enable ALSA debug code.
 
-config SND_DEBUG_MEMORY
-       bool "Debug memory"
-       depends on SND_DEBUG
-       help
-         Say Y here to enable debugging of memory allocations.
-
 config SND_DEBUG_DETECT
        bool "Debug detection"
        depends on SND_DEBUG
@@ -137,3 +172,12 @@ config SND_DEBUG_DETECT
          Say Y here to enable extra-verbose log messages printed when
          detecting devices.
 
+config SND_PCM_XRUN_DEBUG
+       bool "Enable PCM ring buffer overrun/underrun debugging"
+       default n
+       depends on SND_DEBUG && SND_VERBOSE_PROCFS
+       help
+         Say Y to enable the PCM ring buffer overrun/underrun debugging.
+         It is usually not required, but if you have trouble with
+         sound clicking when system is loaded, it may help to determine
+         the process or driver which causes the scheduling gaps.