Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / char / watchdog / Kconfig

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 847a26064b6822cd1ff82cf7c58b9d2b746799a3..ea09d0c974ea41a442b8233ad17f0e6303acb2ea 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -60,7 +60,7 @@ config SOFT_WATCHDOG
 
 # ARM Architecture
 
-config AT91_WATCHDOG
+config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"
        depends on WATCHDOG && ARCH_AT91RM9200
        help
@@ -316,13 +316,16 @@ config I8XX_TCO
          To compile this driver as a module, choose M here: the
          module will be called i8xx_tco.
 
+         Note: This driver will be removed in the near future. Please
+         use the Intel TCO Timer/Watchdog driver.
+
 config ITCO_WDT
-       tristate "Intel TCO Timer/Watchdog (EXPERIMENTAL)"
-       depends on WATCHDOG && (X86 || IA64) && PCI && EXPERIMENTAL
+       tristate "Intel TCO Timer/Watchdog"
+       depends on WATCHDOG && (X86 || IA64) && PCI
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller
-         Hub family 'from ICH0 up to ICH7) and in the Intel 6300ESB
+         Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
          controller hub.
 
          The TCO (Total Cost of Ownership) timer is a watchdog timer
@@ -337,6 +340,14 @@ config ITCO_WDT
          To compile this driver as a module, choose M here: the
          module will be called iTCO_wdt.
 
+config ITCO_VENDOR_SUPPORT
+       bool "Intel TCO Timer/Watchdog Specific Vendor Support"
+       depends on ITCO_WDT
+       ---help---
+         Add vendor specific support to the intel TCO timer based watchdog
+         devices. At this moment we only have additional support for some
+         SuperMicro Inc. motherboards.
+
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on WATCHDOG && X86
@@ -360,6 +371,20 @@ config SCx200_WDT
 
          If compiled as a module, it will be called scx200_wdt.
 
+config PC87413_WDT
+       tristate "NS PC87413 watchdog"
+       depends on WATCHDOG && X86
+       ---help---
+         This is the driver for the hardware watchdog on the PC87413 chipset
+         This watchdog simply watches your kernel to make sure it doesn't
+         freeze, and if it does, it reboots your computer after a certain
+         amount of time.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pc87413_wdt.
+
+         Most people will say N.
+ 
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on WATCHDOG && X86
@@ -550,6 +575,16 @@ config INDYDOG
          timer expired and no process has written to /dev/watchdog during
          that time.
 
+config WDT_RM9K_GPI
+       tristate "RM9000/GPI hardware watchdog"
+       depends on WATCHDOG && 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.
+
 # S390 Architecture
 
 config ZVM_WATCHDOG
@@ -590,7 +625,7 @@ config SH_WDT_MMAP
        help
          If you say Y here, user applications will be able to mmap the
          WDT/CPG registers.
-#
+
 # SPARC64 Architecture
 
 config WATCHDOG_CP1XXX