Merge branch 'linus' into core/urgent

[karo-tx-linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 0635e72e0794c0582f4ed091dc38bc51d1ff181b..86b0735e6aa0fd652ace4ba8546e0a49245590f2 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -28,6 +28,14 @@ menuconfig WATCHDOG
 
 if WATCHDOG
 
+config WATCHDOG_CORE
+       bool "WatchDog Timer Driver Core"
+       ---help---
+         Say Y here if you want to use the new watchdog timer driver core.
+         This driver provides a framework for all watchdog timer drivers
+         and gives them the /dev/watchdog interface (and later also the
+         sysfs interface).
+
 config WATCHDOG_NOWAYOUT
        bool "Disable watchdog shutdown on close"
        help