Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3902c9ca7f099dc0de87bfe4be2b2c486bfc6933..b54f26c55dfd1df46fcd5114660406edfd7e2820 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -746,7 +746,7 @@ config ALIM7101_WDT
 
 config EBC_C384_WDT
        tristate "WinSystems EBC-C384 Watchdog Timer"
-       depends on X86
+       depends on X86 && ISA
        select WATCHDOG_CORE
        help
          Enables watchdog timer support for the watchdog timer on the
@@ -1483,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