Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[safe/jmp/linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d958b76..0e8468f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -194,7 +194,7 @@ config EP93XX_WATCHDOG
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"
-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
+       depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3
        help
          Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog.  Say 'Y'
          here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.
@@ -289,6 +289,23 @@ config ADX_WATCHDOG
          Say Y here if you want support for the watchdog timer on Avionic
          Design Xanthos boards.
 
+config TS72XX_WATCHDOG
+       tristate "TS-72XX SBC Watchdog"
+       depends on MACH_TS72XX
+       help
+         Technologic Systems TS-7200, TS-7250 and TS-7260 boards have
+         watchdog timer implemented in a external CPLD chip. Say Y here
+         if you want to support for the watchdog timer on TS-72XX boards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ts72xx_wdt.
+
+config MAX63XX_WATCHDOG
+       tristate "Max63xx watchdog"
+       depends on ARM
+       help
+         Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -368,7 +385,7 @@ config ALIM7101_WDT
 
 config GEODE_WDT
        tristate "AMD Geode CS5535/CS5536 Watchdog"
-       depends on MGEODE_LX
+       depends on CS5535_MFGPT
        help
          This driver enables a watchdog capability built into the
          CS5535/CS5536 companion chips for the AMD Geode GX and LX
@@ -396,8 +413,8 @@ config SBC_FITPC2_WATCHDOG
        tristate "Compulab SBC-FITPC2 watchdog"
        depends on X86
        ---help---
-         This is the driver for the built-in watchdog timer on the fit-PC2
-         Single-board computer made by Compulab.
+         This is the driver for the built-in watchdog timer on the fit-PC2,
+         fit-PC2i, CM-iAM single-board computers made by Compulab.
 
          It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
          When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
@@ -815,16 +832,6 @@ config PNX833X_WDT
          timer has expired and no process has written to /dev/watchdog during
          that time.
 
-config WDT_RM9K_GPI
-       tristate "RM9000/GPI hardware watchdog"
-       depends on CPU_RM9000
-       help
-         Watchdog implementation using the GPI hardware found on
-         PMC-Sierra RM9xxx CPUs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called rm9k_wdt.
-
 config SIBYTE_WDOG
        tristate "Sibyte SoC hardware watchdog"
        depends on CPU_SB1
@@ -855,10 +862,10 @@ config TXX9_WDT
 # POWERPC Architecture
 
 config GEF_WDT
-       tristate "GE Fanuc Watchdog Timer"
+       tristate "GE Watchdog Timer"
        depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
        ---help---
-         Watchdog timer found in a number of GE Fanuc single board computers.
+         Watchdog timer found in a number of GE single board computers.
 
 config MPC5200_WDT
        bool "MPC52xx Watchdog Timer"