watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b04b184..cee25e4 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -73,6 +73,13 @@ config WM8350_WATCHDOG
 
 # ARM Architecture
 
+config ARM_SP805_WATCHDOG
+       tristate "ARM SP805 Watchdog"
+       depends on ARM_AMBA
+       help
+         ARM Primecell SP805 Watchdog timer. This will reboot your system when
+         the timeout is reached.
+
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"
        depends on ARCH_AT91RM9200
@@ -401,6 +408,17 @@ config ALIM7101_WDT
 
          Most people will say N.
 
+config F71808E_WDT
+       tristate "Fintek F71808E and F71882FG Watchdog"
+       depends on X86 && EXPERIMENTAL
+       help
+         This is the driver for the hardware watchdog on the Fintek
+         F71808E and F71882FG Super I/O controllers.
+
+         You can compile this driver directly into the kernel, or use
+         it as a module.  The module will be called f71808e_wdt.
+
+
 config GEODE_WDT
        tristate "AMD Geode CS5535/CS5536 Watchdog"
        depends on CS5535_MFGPT
@@ -556,11 +574,11 @@ config IT87_WDT
          be called it87_wdt.
 
 config HP_WATCHDOG
-       tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+       tristate "HP Proliant iLO2+ 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
+         will detect lockups and provide a 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.