Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 4262a1c8773191f072b48277a5f42eb2b5d19cb7..a8d71c6c8e7593f1619733bc7c9635bf118d43ca 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -122,8 +122,8 @@ 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"
+       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
@@ -146,7 +146,7 @@ config SND_VERBOSE_PROCFS
        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
@@ -181,3 +181,7 @@ config SND_PCM_XRUN_DEBUG
          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
+       depends on SND