Merge git://git.tuxdriver.com/git/netdev-jwl

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 6ae1d2e24b4e9244c9575efc38e74e31e752bad1..82718836f93726a0d2ec464117b759dc4aa28442 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -99,6 +99,18 @@ 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_VERBOSE_PRINTK
        bool "Verbose printk"
        depends on SND
@@ -115,12 +127,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