Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index db20542796bff39c0361e8985ce5284524390d4f..4fd3fa5546b12282e5b25e521e5a7d5bb5bb829e 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.
 
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 

+config AT91SAM9X_WATCHDOG
+       tristate "AT91SAM9X / AT91CAP9 watchdog"
+       depends on ARCH_AT91 && !ARCH_AT91RM9200
+       help
+         Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
+         reboot your system when the timeout is reached.
+

 config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE
 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.
 
          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
 # 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.
 
          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
 config HP_WATCHDOG
        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
        depends on X86


@@ -465,6 +493,16 @@ config PC87413_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config RDC321X_WDT
+       tristate "RDC R-321x SoC watchdog"
+       depends on X86_RDC321X
+       help
+         This is the driver for the built in hardware watchdog
+         in the RDC R-321x SoC.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rdc321x_wdt.
+

 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86


@@ -563,6 +601,21 @@ config W83697HF_WDT
 
          Most people will say N.
 
 
          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
 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
        depends on X86


@@ -633,6 +686,16 @@ config SBC_EPX_C3_WATCHDOG
 
 # MIPS Architecture
 
 
 # MIPS Architecture
 

+config RC32434_WDT
+       tristate "IDT RC32434 SoC Watchdog Timer"
+       depends on MIKROTIK_RB532
+       help
+         Hardware driver for the IDT RC32434 SoC built-in
+         watchdog timer.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rc32434_wdt.
+

 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG


@@ -692,10 +755,6 @@ config MPC5200_WDT
        tristate "MPC5200 Watchdog Timer"
        depends on PPC_MPC52xx
 
        tristate "MPC5200 Watchdog Timer"
        depends on PPC_MPC52xx
 

-config 8xx_WDT
-       tristate "MPC8xx Watchdog Timer"
-       depends on 8xx
-

 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
        depends on PPC_8xx || PPC_83xx || PPC_86xx
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
        depends on PPC_8xx || PPC_83xx || PPC_86xx