1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 16c30e6aa1ee..accbf75032ef 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -2062,6 +2062,20 @@ config WATCHDOG_PRETIMEOUT_GOV
 
 if WATCHDOG_PRETIMEOUT_GOV
 
+config WATCHDOG_PRETIMEOUT_GOV_NOOP
+        tristate "Noop watchdog pretimeout governor"
+        default WATCHDOG_CORE
+        help
+          Noop watchdog pretimeout governor, only an informational
+          message is added to kernel log buffer.
+
+config WATCHDOG_PRETIMEOUT_GOV_PANIC
+        tristate "Panic watchdog pretimeout governor"
+        default WATCHDOG_CORE
+        help
+          Panic watchdog pretimeout governor, on watchdog pretimeout
+          event put the kernel into panic.
+
 choice
         prompt "Default Watchdog Pretimeout Governor"
         default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
@@ -2072,7 +2086,7 @@ choice
 
 config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
         bool "noop"
-        select WATCHDOG_PRETIMEOUT_GOV_NOOP
+        depends on WATCHDOG_PRETIMEOUT_GOV_NOOP
         help
           Use noop watchdog pretimeout governor by default. If noop
           governor is selected by a user, write a short message to
@@ -2080,7 +2094,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
 
 config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
         bool "panic"
-        select WATCHDOG_PRETIMEOUT_GOV_PANIC
+        depends on WATCHDOG_PRETIMEOUT_GOV_PANIC
         help
           Use panic watchdog pretimeout governor by default, if
           a watchdog pretimeout event happens, consider that
@@ -2088,18 +2102,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
 
 endchoice
 
-config WATCHDOG_PRETIMEOUT_GOV_NOOP
-        tristate "Noop watchdog pretimeout governor"
-        help
-          Noop watchdog pretimeout governor, only an informational
-          message is added to kernel log buffer.
-
-config WATCHDOG_PRETIMEOUT_GOV_PANIC
-        tristate "Panic watchdog pretimeout governor"
-        help
-          Panic watchdog pretimeout governor, on watchdog pretimeout
-          event put the kernel into panic.
-
 endif # WATCHDOG_PRETIMEOUT_GOV
 
 endif # WATCHDOG