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

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index afcdc69..ccb78f6 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -295,6 +295,19 @@ config ALIM7101_WDT
 
          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
@@ -402,6 +415,18 @@ config 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
@@ -633,6 +658,19 @@ config WDT_RM9K_GPI
          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