watchdog: i6300esb: fix build failure

[platform/kernel/linux-rpi.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5bf613d..56f9e20 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -226,6 +226,7 @@ config ZIIRAVE_WATCHDOG
 config RAVE_SP_WATCHDOG
        tristate "RAVE SP Watchdog timer"
        depends on RAVE_SP_CORE
+       depends on NVMEM || !NVMEM
        select WATCHDOG_CORE
        help
          Support for the watchdog on RAVE SP device.
@@ -328,16 +329,18 @@ config 977_WATCHDOG
 
          Not sure? It's safe to say N.
 
-config GEMINI_WATCHDOG
-       tristate "Gemini watchdog"
-       depends on ARCH_GEMINI
+config FTWDT010_WATCHDOG
+       tristate "Faraday Technology FTWDT010 watchdog"
+       depends on ARM || COMPILE_TEST
        select WATCHDOG_CORE
+       default ARCH_GEMINI
        help
-         Say Y here if to include support for the watchdog timer
-         embedded in the Cortina Systems Gemini family of devices.
+         Say Y here if to include support for the Faraday Technology
+         FTWDT010 watchdog timer embedded in the Cortina Systems Gemini
+         family of devices.
 
          To compile this driver as a module, choose M here: the
-         module will be called gemini_wdt.
+         module will be called ftwdt010_wdt.
 
 config IXP4XX_WATCHDOG
        tristate "IXP4xx Watchdog"
@@ -748,12 +751,12 @@ config RENESAS_RZAWDT
          Renesas RZ/A SoCs. These watchdogs can be used to reset a system.
 
 config ASPEED_WATCHDOG
-       tristate "Aspeed 2400 watchdog support"
+       tristate "Aspeed BMC watchdog support"
        depends on ARCH_ASPEED || COMPILE_TEST
        select WATCHDOG_CORE
        help
          Say Y here to include support for the watchdog timer
-         in Apseed BMC SoCs.
+         in Aspeed BMC SoCs.
 
          This driver is required to reboot the SoC.
 
@@ -794,14 +797,23 @@ config UNIPHIER_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called uniphier_wdt.
 
-# AVR32 Architecture
+config RTD119X_WATCHDOG
+       bool "Realtek RTD119x/RTD129x watchdog support"
+       depends on ARCH_REALTEK || COMPILE_TEST
+       depends on OF
+       select WATCHDOG_CORE
+       default ARCH_REALTEK
+       help
+         Say Y here to include support for the watchdog timer in
+         Realtek RTD1295 SoCs.
 
-config AT32AP700X_WDT
-       tristate "AT32AP700x watchdog"
-       depends on CPU_AT32AP700X || COMPILE_TEST
+config SPRD_WATCHDOG
+       tristate "Spreadtrum watchdog support"
+       depends on ARCH_SPRD || COMPILE_TEST
+       select WATCHDOG_CORE
        help
-         Watchdog timer embedded into AT32AP700x devices. This will reboot
-         your system when the timeout is reached.
+         Say Y here to include watchdog timer supported
+         by Spreadtrum system.
 
 # BLACKFIN Architecture
 
@@ -997,6 +1009,7 @@ config WAFER_WDT
 config I6300ESB_WDT
        tristate "Intel 6300ESB Timer/Watchdog"
        depends on PCI
+       select WATCHDOG_CORE
        ---help---
          Hardware driver for the watchdog timer built into the Intel
          6300ESB controller hub.
@@ -1458,7 +1471,7 @@ config RC32434_WDT
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
-       depends on SGI_HAS_INDYDOG || (MIPS && COMPILE_TEST)
+       depends on SGI_HAS_INDYDOG
        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second