Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 79fd606b7cd5cad60f487120db2e3ebf408ddedb..877b107f77a769577111ce5f9eee41742be8fa32 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -772,6 +772,19 @@ config SMSC37B787_WDT
 
          Most people will say N.
 
+config VIA_WDT
+       tristate "VIA Watchdog Timer"
+       depends on X86
+       select WATCHDOG_CORE
+       ---help---
+       This is the driver for the hardware watchdog timer on VIA
+       southbridge chipset CX700, VX800/VX820 or VX855/VX875.
+
+       To compile this driver as a module, choose M here; the module
+       will be called via_wdt.
+
+       Most people will say N.
+
 config W83627HF_WDT
        tristate "W83627HF/W83627DHG Watchdog Timer"
        depends on X86