Merge branch 'classmate' into release

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index db21113..475455c 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -5,6 +5,7 @@ config SND_TIMER
 config SND_PCM
        tristate
        select SND_TIMER
+       select GCD
 
 config SND_HWDEP
        tristate
@@ -12,6 +13,12 @@ config SND_HWDEP
 config SND_RAWMIDI
        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.
+config SND_JACK
+       bool
+
 config SND_SEQUENCER
        tristate "Sequencer support"
        select SND_TIMER
@@ -38,6 +45,7 @@ config SND_SEQ_DUMMY
          will be called snd-seq-dummy.
 
 config SND_OSSEMUL
+       select SOUND_OSS_CORE
        bool
 
 config SND_MIXER_OSS
@@ -88,6 +96,26 @@ config SND_SEQUENCER_OSS
          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-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 RTC
@@ -101,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
@@ -153,12 +185,14 @@ config SND_DEBUG
        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"
@@ -172,3 +206,9 @@ config SND_PCM_XRUN_DEBUG
 
 config SND_VMASTER
        bool
+
+config SND_DMA_SGBUF
+       def_bool y
+       depends on X86
+
+source "sound/core/seq/Kconfig"