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 eb439b481db671a800ad60c4ad94f228e103d7d8..4a3907fc8a5b1aa12bad006db5e4c4d0ed196b65 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -392,6 +392,16 @@ config ITCO_VENDOR_SUPPORT
          devices. At this moment we only have additional support for some
          SuperMicro Inc. motherboards.
 
+config IT8712F_WDT
+       tristate "IT8712F (Smart Guardian) Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the built-in watchdog timer on the IT8712F
+         Super I/0 chipset used on many motherboards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called it8712f_wdt.
+
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86
@@ -456,6 +466,19 @@ config SBC8360_WDT
 
          Most people will say N.
 
+config SBC7240_WDT
+       tristate "SBC Nano 7240 Watchdog Timer"
+       depends on X86_32
+       ---help---
+         This is the driver for the hardware watchdog found on the IEI
+         single board computers EPIC Nano 7240 (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 sbc7240_wdt.
+
 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
        depends on X86