Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ab5c648..39923cc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1098,12 +1098,12 @@ config SLOW_WORK
 
          See Documentation/slow-work.txt.
 
-config SLOW_WORK_PROC
-       bool "Slow work debugging through /proc"
+config SLOW_WORK_DEBUG
+       bool "Slow work debugging through debugfs"
        default n
-       depends on SLOW_WORK && PROC_FS
+       depends on SLOW_WORK && DEBUG_FS
        help
-         Display the contents of the slow work run queue through /proc,
+         Display the contents of the slow work run queue through debugfs,
          including items currently executing.
 
          See Documentation/slow-work.txt.