IB/hfi1: Remove unused function hfi1_mmu_rb_search

[deliverable/linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index fb947655badd02de231dd0777e88499c8a552044..b4b3e256491bfbe8c05fa0f7830c003541db8720 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -661,6 +661,14 @@ config ATLAS7_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called atlas7_wdt.
 
+config RENESAS_WDT
+       tristate "Renesas WDT Watchdog"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       select WATCHDOG_CORE
+       help
+         This driver adds watchdog support for the integrated watchdogs in the
+         Renesas R-Car and other SH-Mobile SoCs (usually named RWDT or SWDT).
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -738,7 +746,7 @@ config ALIM7101_WDT
 
 config EBC_C384_WDT
        tristate "WinSystems EBC-C384 Watchdog Timer"
-       depends on X86
+       depends on X86 && ISA_BUS_API
        select WATCHDOG_CORE
        help
          Enables watchdog timer support for the watchdog timer on the
@@ -1475,6 +1483,32 @@ config MT7621_WDT
        help
          Hardware driver for the Mediatek/Ralink MT7621/8 SoC Watchdog Timer.
 
+config PIC32_WDT
+       tristate "Microchip PIC32 hardware watchdog"
+       select WATCHDOG_CORE
+       depends on MACH_PIC32
+       help
+         Watchdog driver for the built in watchdog hardware in a PIC32.
+
+         Configuration bits must be set appropriately for the watchdog to be
+         controlled by this driver.
+
+         To compile this driver as a loadable module, choose M here.
+         The module will be called pic32-wdt.
+
+config PIC32_DMT
+       tristate "Microchip PIC32 Deadman Timer"
+       select WATCHDOG_CORE
+       depends on MACH_PIC32
+       help
+         Watchdog driver for PIC32 instruction fetch counting timer. This specific
+         timer is typically be used in misson critical and safety critical
+         applications, where any single failure of the software functionality
+         and sequencing must be detected.
+
+         To compile this driver as a loadable module, choose M here.
+         The module will be called pic32-dmt.
+
 # PARISC Architecture
 
 # POWERPC Architecture