Merge branch 'classmate' into release

[safe/jmp/linux-2.6] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 9dd121b..475455c 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -1,24 +1,26 @@
 # ALSA soundcard-configuration
 config SND_TIMER
        tristate
-       depends on SND
 
 config SND_PCM
        tristate
        select SND_TIMER
-       depends on SND
+       select GCD
 
 config SND_HWDEP
        tristate
-       depends on SND
 
 config SND_RAWMIDI
        tristate
-       depends on SND
+
+# 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.
+config SND_JACK
+       bool
 
 config SND_SEQUENCER
        tristate "Sequencer support"
-       depends on SND
        select SND_TIMER
        help
          Say Y or M to enable MIDI sequencer and router support.  This
@@ -43,12 +45,11 @@ config SND_SEQ_DUMMY
          will be called snd-seq-dummy.
 
 config SND_OSSEMUL
+       select SOUND_OSS_CORE
        bool
-       depends on SND
 
 config SND_MIXER_OSS
        tristate "OSS Mixer API"
-       depends on SND
        select SND_OSSEMUL
        help
          To enable OSS mixer API emulation (/dev/mixer*), say Y here
@@ -61,7 +62,6 @@ config SND_MIXER_OSS
 
 config SND_PCM_OSS
        tristate "OSS PCM (digital audio) API"
-       depends on SND
        select SND_OSSEMUL
        select SND_PCM
        help
@@ -84,7 +84,7 @@ config SND_PCM_OSS_PLUGINS
 
 config SND_SEQUENCER_OSS
        bool "OSS Sequencer API"
-       depends on SND && SND_SEQUENCER
+       depends on SND_SEQUENCER
        select SND_OSSEMUL
        help
          Say Y here to enable OSS sequencer emulation (both
@@ -92,12 +92,33 @@ config SND_SEQUENCER_OSS
 
          Many programs still use the OSS API, so say Y.
 
+         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_HRTIMER
+       tristate "HR-timer backend support"
+       depends on HIGH_RES_TIMERS
+       select SND_TIMER
+       help
+         Say Y here to enable HR-timer backend for ALSA timer.  ALSA uses
+         the hrtimer as a precise timing source. The ALSA sequencer code
+         also can use this timing source.
+
          To compile this driver as a module, choose M here: the module
-         will be called snd-seq-oss.
+         will be called snd-hrtimer.
+
+config SND_SEQ_HRTIMER_DEFAULT
+       bool "Use HR-timer as default sequencer timer"
+       depends on SND_HRTIMER && SND_SEQUENCER
+       default y
+       help
+         Say Y here to use the HR-timer backend as the default sequencer
+         timer.
 
 config SND_RTCTIMER
        tristate "RTC Timer support"
-       depends on SND && RTC
+       depends on RTC
        select SND_TIMER
        help
          Say Y here to enable RTC timer support for ALSA.  ALSA uses
@@ -108,9 +129,13 @@ config SND_RTCTIMER
          To compile this driver as a module, choose M here: the module
          will be called snd-rtctimer.
 
+         Note that this option is exclusive with the new RTC drivers
+         (CONFIG_RTC_CLASS) since this requires the old API.
+
 config SND_SEQ_RTCTIMER_DEFAULT
        bool "Use RTC as default sequencer timer"
        depends on SND_RTCTIMER && SND_SEQUENCER
+       depends on !SND_SEQ_HRTIMER_DEFAULT
        default y
        help
          Say Y here to use the RTC timer as the default sequencer
@@ -121,8 +146,7 @@ config SND_SEQ_RTCTIMER_DEFAULT
          If in doubt, say Y.
 
 config SND_DYNAMIC_MINORS
-       bool "Dynamic device file minor numbers (EXPERIMENTAL)"
-       depends on SND && EXPERIMENTAL
+       bool "Dynamic device file minor numbers"
        help
          If you say Y here, the minor numbers of ALSA device files in
          /dev/snd/ are allocated dynamically.  This allows you to have
@@ -133,7 +157,6 @@ config SND_DYNAMIC_MINORS
 
 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
@@ -141,16 +164,15 @@ config SND_SUPPORT_OLD_API
 
 config SND_VERBOSE_PROCFS
        bool "Verbose procfs contents"
-       depends on SND
+       depends on 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
+          useful 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
        help
          Say Y here to enable verbose log messages.  These messages
          will help to identify source file and position containing
@@ -160,13 +182,33 @@ config SND_VERBOSE_PRINTK
 
 config SND_DEBUG
        bool "Debug"
-       depends on SND
        help
          Say Y here to enable ALSA debug code.
 
-config SND_DEBUG_DETECT
-       bool "Debug detection"
+config SND_DEBUG_VERBOSE
+       bool "More verbose debug"
        depends on SND_DEBUG
        help
-         Say Y here to enable extra-verbose log messages printed when
-         detecting devices.
+         Say Y here to enable extra-verbose debugging messages.
+         
+         Let me repeat: it enables EXTRA-VERBOSE DEBUGGING messages.
+         So, say Y only if you are ready to be annoyed.
+
+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.
+
+config SND_VMASTER
+       bool
+
+config SND_DMA_SGBUF
+       def_bool y
+       depends on X86
+
+source "sound/core/seq/Kconfig"