Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 52dff40ec192caeea2042f07cb09021914c52c36..32b9fe1536413c28e52526a1d3949214a923100d 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -223,7 +223,7 @@ config DAVINCI_WATCHDOG
 
 config AT32AP700X_WDT
        tristate "AT32AP700x watchdog"
 
 config AT32AP700X_WDT
        tristate "AT32AP700x watchdog"

-       depends on CPU_AT32AP7000
+       depends on CPU_AT32AP700X

        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.


@@ -295,6 +295,19 @@ config ALIM7101_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config GEODE_WDT
+       tristate "AMD Geode CS5535/CS5536 Watchdog"
+       depends on MGEODE_LX
+       help
+         This driver enables a watchdog capability built into the
+         CS5535/CS5536 companion chips for the AMD Geode GX and LX
+         processors.  This watchdog watches your kernel to make sure
+         it doesn't freeze, and if it does, it reboots your computer after
+         a certain amount of time.
+
+         You can compile this driver directly into the kernel, or use
+         it as a module.  The module will be called geodewdt.
+

 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"
        depends on X86
 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"
        depends on X86


@@ -402,6 +415,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 HP_WATCHDOG
+       tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+       depends on X86
+       help
+         A software monitoring watchdog and NMI sourcing driver. This driver
+         will detect lockups and provide stack trace. Also, when an NMI
+         occurs this driver will make the necessary BIOS calls to log
+         the cause of the NMI. This is a driver that will only load on a
+         HP ProLiant system with a minimum of iLO2 support.
+         To compile this driver as a module, choose M here: the
+         module will be called hpwdt.
+

 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86


@@ -438,7 +463,7 @@ config PC87413_WDT
          module will be called pc87413_wdt.
 
          Most people will say N.
          module will be called pc87413_wdt.
 
          Most people will say N.

- 
+

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


@@ -609,7 +634,7 @@ config SBC_EPX_C3_WATCHDOG
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"

-       depends on SGI_IP22
+       depends on SGI_HAS_INDYDOG

        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second
        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second


@@ -633,12 +658,31 @@ config WDT_RM9K_GPI
          To compile this driver as a module, choose M here: the
          module will be called rm9k_wdt.
 
          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
+       help
+         Watchdog driver for the built in watchdog hardware in Sibyte
+         SoC processors.  There are apparently two watchdog timers
+         on such processors; this driver supports only the first one,
+         because currently Linux only supports exporting one watchdog
+         to userspace.
+
+         To compile this driver as a loadable module, choose M here.
+         The module will be called sb_wdog.
+

 config AR7_WDT
        tristate "TI AR7 Watchdog Timer"
        depends on AR7
        help
          Hardware driver for the TI AR7 Watchdog Timer.
 
 config AR7_WDT
        tristate "TI AR7 Watchdog Timer"
        depends on AR7
        help
          Hardware driver for the TI AR7 Watchdog Timer.
 

+config TXX9_WDT
+       tristate "Toshiba TXx9 Watchdog Timer"
+       depends on CPU_TX39XX || CPU_TX49XX
+       help
+         Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
+

 # PARISC Architecture
 
 # POWERPC Architecture
 # PARISC Architecture
 
 # POWERPC Architecture


@@ -651,9 +695,17 @@ config 8xx_WDT
        tristate "MPC8xx Watchdog Timer"
        depends on 8xx
 
        tristate "MPC8xx Watchdog Timer"
        depends on 8xx
 

-config 83xx_WDT
-       tristate "MPC83xx Watchdog Timer"
-       depends on PPC_83xx
+config 8xxx_WDT
+       tristate "MPC8xxx Platform Watchdog Timer"
+       depends on PPC_8xx || PPC_83xx || PPC_86xx
+       help
+         This driver is for a SoC level watchdog that exists on some
+         Freescale PowerPC processors. So far this driver supports:
+         - MPC8xx watchdogs
+         - MPC83xx watchdogs
+         - MPC86xx watchdogs
+
+         For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.

 
 config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
 
 config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"


@@ -744,8 +796,6 @@ config WATCHDOG_RIO
          machines.  The watchdog timeout period is normally one minute but
          can be changed with a boot-time parameter.
 
          machines.  The watchdog timeout period is normally one minute but
          can be changed with a boot-time parameter.
 

-# V850 Architecture
-

 # XTENSA Architecture
 
 #
 # XTENSA Architecture
 
 #