Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b02d0cd9b1c85f41cc7665bca92e35ae462a4c9b..10c3c3d8ad657e00960d6b64c011baf8d6fc51e5 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -66,6 +66,13 @@ config AT91RM9200_WATCHDOG
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 
+config AT91SAM9X_WATCHDOG
+       tristate "AT91SAM9X watchdog"
+       depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)
+       help
+         Watchdog timer embedded into AT91SAM9X chips. This will reboot your
+         system when the timeout is reached.
+
 config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE
@@ -217,6 +224,15 @@ config DAVINCI_WATCHDOG
          NOTE: once enabled, this timer cannot be disabled.
          Say N if you are unsure.
 
+config ORION5X_WATCHDOG
+       tristate "Orion5x watchdog"
+       depends on ARCH_ORION5X
+       help
+         Say Y here if to include support for the watchdog timer
+         in the Orion5x ARM SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called orion5x_wdt.
+
 # ARM26 Architecture
 
 # AVR32 Architecture
@@ -416,6 +432,18 @@ config IT8712F_WDT
          To compile this driver as a module, choose M here: the
          module will be called it8712f_wdt.
 
+config IT87_WDT
+       tristate "IT87 Watchdog Timer"
+       depends on X86 && EXPERIMENTAL
+       ---help---
+         This is the driver for the hardware watchdog on the ITE IT8716,
+         IT8718, IT8726, IT8712(Version J,K) Super I/O chips. 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 it87_wdt.
+
 config HP_WATCHDOG
        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
        depends on X86
@@ -573,6 +601,21 @@ config W83697HF_WDT
 
          Most people will say N.
 
+config W83697UG_WDT
+       tristate "W83697UG/W83697UF Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the hardware watchdog on the W83697UG/UF
+         chipset as used in MSI Fuzzy CX700 VIA motherboards (and likely others).
+         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 w83697ug_wdt.
+
+         Most people will say N.
+
 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
        depends on X86