Merge tag 'iio-fixes-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 37460cd6cabb806ecdf536f5a44019ff845164b9..9af07fd927636173ff933b59f21ec74ecd5645e3 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -514,6 +514,17 @@ config COH901327_WATCHDOG
          This watchdog is used to reset the system and thus cannot be
          compiled as a module.
 
+config NPCM7XX_WATCHDOG
+       bool "Nuvoton NPCM750 watchdog"
+       depends on ARCH_NPCM || COMPILE_TEST
+       default y if ARCH_NPCM750
+       select WATCHDOG_CORE
+       help
+         Say Y here to include Watchdog timer support for the
+         watchdog embedded into the NPCM7xx.
+         This watchdog is used to reset the system and thus cannot be
+         compiled as a module.
+
 config TWL4030_WATCHDOG
        tristate "TWL4030 Watchdog"
        depends on TWL4030_CORE
@@ -815,23 +826,6 @@ config SPRD_WATCHDOG
          Say Y here to include watchdog timer supported
          by Spreadtrum system.
 
-# BLACKFIN Architecture
-
-config BFIN_WDT
-       tristate "Blackfin On-Chip Watchdog Timer"
-       depends on BLACKFIN
-       ---help---
-         If you say yes here you will get support for the Blackfin On-Chip
-         Watchdog Timer. If you have one of these processors and wish to
-         have watchdog support enabled, say Y, otherwise say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called bfin_wdt.
-
-# CRIS Architecture
-
-# FRV Architecture
-
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
@@ -883,7 +877,8 @@ config ALIM7101_WDT
 
 config EBC_C384_WDT
        tristate "WinSystems EBC-C384 Watchdog Timer"
-       depends on X86 && ISA_BUS_API
+       depends on X86
+       select ISA_BUS_API
        select WATCHDOG_CORE
        help
          Enables watchdog timer support for the watchdog timer on the
@@ -1118,6 +1113,7 @@ config IT87_WDT
 
 config HP_WATCHDOG
        tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
+       select WATCHDOG_CORE
        depends on X86 && PCI
        help
          A software monitoring watchdog and NMI sourcing driver. This driver
@@ -1431,8 +1427,6 @@ config NIC7018_WDT
          To compile this driver as a module, choose M here: the module will be
          called nic7018_wdt.
 
-# M32R Architecture
-
 # M68K Architecture
 
 config M54xx_WATCHDOG
@@ -1605,7 +1599,7 @@ config BCM7038_WDT
 config IMGPDC_WDT
        tristate "Imagination Technologies PDC Watchdog Timer"
        depends on HAS_IOMEM
-       depends on METAG || MIPS || COMPILE_TEST
+       depends on MIPS || COMPILE_TEST
        select WATCHDOG_CORE
        help
          Driver for Imagination Technologies PowerDown Controller