[PATCH] inotify: fix deadlock found by lockdep

[linux-2.6] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index f3a07fb2e690a88c8ace59552c1699f940b41c4f..b2927523d79df9c7ad796049ebb8145fb537ac57 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
@@ -142,7 +142,7 @@ config SND_SUPPORT_OLD_API
 
 config SND_VERBOSE_PROCFS
        bool "Verbose procfs contents"
-       depends on SND
+       depends on SND && PROC_FS
        default y
        help
          Say Y here to include code for verbose procfs contents (provides
@@ -175,7 +175,7 @@ config SND_DEBUG_DETECT
 config SND_PCM_XRUN_DEBUG
        bool "Enable PCM ring buffer overrun/underrun debugging"
        default n
-       depends on SND_DEBUG
+       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