Merge branch 'kvm-fixes' into 'next'

[linux-2.6-microblaze.git] / security / tomoyo / Kconfig

diff --git a/security/tomoyo/Kconfig b/security/tomoyo/Kconfig
index 9221ea5..b9f8671 100644 (file)
--- a/security/tomoyo/Kconfig
+++ b/security/tomoyo/Kconfig
@@ -43,7 +43,7 @@ config SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
        bool "Activate without calling userspace policy loader."
        default n
        depends on SECURITY_TOMOYO
-       ---help---
+       help
          Say Y here if you want to activate access control as soon as built-in
          policy was loaded. This option will be useful for systems where
          operations which can lead to the hijacking of the boot sequence are
@@ -60,7 +60,7 @@ config SECURITY_TOMOYO_POLICY_LOADER
        default "/sbin/tomoyo-init"
        depends on SECURITY_TOMOYO
        depends on !SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
-       ---help---
+       help
          This is the default pathname of policy loader which is called before
          activation. You can override this setting via TOMOYO_loader= kernel
          command line option.
@@ -70,7 +70,7 @@ config SECURITY_TOMOYO_ACTIVATION_TRIGGER
        default "/sbin/init"
        depends on SECURITY_TOMOYO
        depends on !SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
-       ---help---
+       help
          This is the default pathname of activation trigger.
          You can override this setting via TOMOYO_trigger= kernel command line
          option. For example, if you pass init=/bin/systemd option, you may