Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2)

[linux-2.6-omap-h63xx.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b71132166f606343f810e47387c7a26b4918fced..1330061020ab54e718ddaed14d71b05c20ae4bf9 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -513,7 +513,7 @@ config ZFCPDUMP
        default n
        help
          Select this option if you want to build an zfcpdump enabled kernel.
-         Refer to "Documentation/s390/zfcpdump.txt" for more details on this.
+         Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 
 endmenu
 
@@ -529,21 +529,7 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menu "Instrumentation Support"
-
-source "arch/s390/oprofile/Kconfig"
-
-config KPROBES
-       bool "Kprobes (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && MODULES
-       help
-         Kprobes allows you to trap at almost any kernel address and
-         execute a callback function.  register_kprobe() establishes
-         a probepoint and specifies the callback.  Kprobes is useful
-         for kernel debugging, non-intrusive instrumentation and testing.
-         If in doubt, say "N".
-
-endmenu
+source "kernel/Kconfig.instrumentation"
 
 source "arch/s390/Kconfig.debug"