watchdog: Move pretimeout governor configuration up

Watchdog pretimeout configuration was at the end of the Kconfig
file, after individual watchdog drivers, and thus easy to miss.
Move it right after basic watchdog option declarations.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index accbf75..ac37a14 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -63,6 +63,58 @@ config WATCHDOG_SYSFS
          Say Y here if you want to enable watchdog device status read through
          sysfs attributes.
 
+comment "Watchdog Pretimeout Governors"
+
+config WATCHDOG_PRETIMEOUT_GOV
+       bool "Enable watchdog pretimeout governors"
+       depends on WATCHDOG_CORE
+       help
+         The option allows to select watchdog pretimeout governors.
+
+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
+       help
+         This option selects a default watchdog pretimeout governor.
+         The governor takes its action, if a watchdog is capable
+         to report a pretimeout event.
+
+config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
+       bool "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
+         the kernel log buffer and don't do any system changes.
+
+config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
+       bool "panic"
+       depends on WATCHDOG_PRETIMEOUT_GOV_PANIC
+       help
+         Use panic watchdog pretimeout governor by default, if
+         a watchdog pretimeout event happens, consider that
+         a watchdog feeder is dead and reboot is unavoidable.
+
+endchoice
+
+endif # WATCHDOG_PRETIMEOUT_GOV
+
 #
 # General Watchdog drivers
 #
@@ -2052,56 +2104,4 @@ config USBPCWATCHDOG
 
          Most people will say N.
 
-comment "Watchdog Pretimeout Governors"
-
-config WATCHDOG_PRETIMEOUT_GOV
-       bool "Enable watchdog pretimeout governors"
-       depends on WATCHDOG_CORE
-       help
-         The option allows to select watchdog pretimeout governors.
-
-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
-       help
-         This option selects a default watchdog pretimeout governor.
-         The governor takes its action, if a watchdog is capable
-         to report a pretimeout event.
-
-config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
-       bool "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
-         the kernel log buffer and don't do any system changes.
-
-config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
-       bool "panic"
-       depends on WATCHDOG_PRETIMEOUT_GOV_PANIC
-       help
-         Use panic watchdog pretimeout governor by default, if
-         a watchdog pretimeout event happens, consider that
-         a watchdog feeder is dead and reboot is unavoidable.
-
-endchoice
-
-endif # WATCHDOG_PRETIMEOUT_GOV
-
 endif # WATCHDOG