Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...

[pandora-kernel.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3c6607d..faa9127 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -418,6 +418,17 @@ config F71808E_WDT
          You can compile this driver directly into the kernel, or use
          it as a module.  The module will be called f71808e_wdt.
 
+config SP5100_TCO
+       tristate "AMD/ATI SP5100 TCO Timer/Watchdog"
+       depends on X86 && PCI
+       ---help---
+         Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO
+         (Total Cost of Ownership) timer is a watchdog timer that will reboot
+         the machine after its expiration. The expiration time can be
+         configured with the "heartbeat" parameter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sp5100_tco.
 
 config GEODE_WDT
        tristate "AMD Geode CS5535/CS5536 Watchdog"
@@ -631,6 +642,24 @@ config PC87413_WDT
 
          Most people will say N.
 
+config NV_TCO
+       tristate "nVidia TCO Timer/Watchdog"
+       depends on X86 && PCI
+       ---help---
+         Hardware driver for the TCO timer built into the nVidia Hub family
+         (such as the MCP51).  The TCO (Total Cost of Ownership) timer is a
+         watchdog timer that will reboot the machine after its second
+         expiration. The expiration time can be configured with the
+         "heartbeat" parameter.
+
+         On some motherboards the driver may fail to reset the chipset's
+         NO_REBOOT flag which prevents the watchdog from rebooting the
+         machine. If this is the case you will get a kernel message like
+         "failed to reset NO_REBOOT flag, reboot disabled by hardware".
+
+         To compile this driver as a module, choose M here: the
+         module will be called nv_tco.
+
 config RDC321X_WDT
        tristate "RDC R-321x SoC watchdog"
        depends on X86_RDC321X
@@ -833,10 +862,22 @@ config SBC_EPX_C3_WATCHDOG
 
 # M68K Architecture
 
-# M68KNOMMU Architecture
+config M548x_WATCHDOG
+       tristate "MCF548x watchdog support"
+       depends on M548x
+       help
+         To compile this driver as a module, choose M here: the
+         module will be called m548x_wdt.
 
 # MIPS Architecture
 
+config ATH79_WDT
+       tristate "Atheros AR71XX/AR724X/AR913X hardware watchdog"
+       depends on ATH79
+       help
+         Hardware driver for the built-in watchdog timer on the Atheros
+         AR71XX/AR724X/AR913X SoCs.
+
 config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"
        depends on BCM47XX
@@ -1042,14 +1083,6 @@ config SH_WDT
          To compile this driver as a module, choose M here: the
          module will be called shwdt.
 
-config SH_WDT_MMAP
-       bool "Allow mmap of SH WDT"
-       default n
-       depends on SH_WDT
-       help
-         If you say Y here, user applications will be able to mmap the
-         WDT/CPG registers.
-
 # SPARC Architecture
 
 # SPARC64 Architecture