Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 29e794f..7738741 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -179,7 +179,7 @@ config CKRM_CPU_SCHEDULE
          Say N if unsure, Y to use the feature.
 
 config CKRM_CPU_MONITOR
-       tristate  "CKRM CPU Resoure Monitor"
+       bool "CKRM CPU Resoure Monitor"
        depends on CKRM_CPU_SCHEDULE
        default m
        help
@@ -247,7 +247,6 @@ config BSD_PROCESS_ACCT_V3
          for processing it. A preliminary version of these tools is available
          at <http://http://www.de.kernel.org/pub/linux/utils/acct/>.
 
-
 config SYSCTL
        bool "Sysctl support"
        ---help---