watchdog: Improve Kconfig entry ordering and dependencies

HPWDT_NMI_DECODING depends on HP_WATCHDOG and should be next to it.
This helps menuconfig identify HPWDT_NMI_DECODING as depending on
HP_WATCHDOG.

BCM_KONA_WDT_DEBUG depends on BCM_KONA_WDT which depends on COMPILE_TEST.
Enabling BCM_KONA_WDT_DEBUG without BCM_KONA_WDT does not make sense,
so drop the COMPILE_TEST dependency from it. This also improves
menuconfig, which now properly associates BCM_KONA_WDT_DEBUG with
BCM_KONA_WDT.

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 e5b30c4947d71a9a0f30123d7b5f9ac8c1a9d733..f457992487ea416b3cdb773640803de3caebc9e3 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1261,6 +1261,15 @@ config HP_WATCHDOG
          To compile this driver as a module, choose M here: the module will be
          called hpwdt.
 
+config HPWDT_NMI_DECODING
+       bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
+       depends on HP_WATCHDOG
+       default y
+       help
+         Enables the NMI handler for the watchdog pretimeout NMI and the iLO
+         "Generate NMI to System" virtual button.  When an NMI is claimed
+         by the driver, panic is called.
+
 config KEMPLD_WDT
        tristate "Kontron COM Watchdog Timer"
        depends on MFD_KEMPLD
@@ -1272,15 +1281,6 @@ config KEMPLD_WDT
          This driver can also be built as a module. If so, the module will be
          called kempld_wdt.
 
-config HPWDT_NMI_DECODING
-       bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
-       depends on HP_WATCHDOG
-       default y
-       help
-         Enables the NMI handler for the watchdog pretimeout NMI and the iLO
-         "Generate NMI to System" virtual button.  When an NMI is claimed
-         by the driver, panic is called.
-
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86
@@ -1729,7 +1729,7 @@ config BCM_KONA_WDT
 
 config BCM_KONA_WDT_DEBUG
        bool "DEBUGFS support for BCM Kona Watchdog"
-       depends on BCM_KONA_WDT || COMPILE_TEST
+       depends on BCM_KONA_WDT
        help
          If enabled, adds /sys/kernel/debug/bcm_kona_wdt/info which provides
          access to the driver's internal data structures as well as watchdog