summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorPhilipp Hachtmann <phacht@de.ibm.com>2014-06-05 11:01:43 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-06-10 10:48:29 +0200
commitf7a94db4e9594fd4b67e715d7b26864b7bd74a75 (patch)
tree78fb2427c31a5c9ba3625725094a899ec111d951 /drivers/watchdog/Kconfig
parentf2485f5d1c62bb8cccd452616892cdaf2466a090 (diff)
downloadop-kernel-dev-f7a94db4e9594fd4b67e715d7b26864b7bd74a75.zip
op-kernel-dev-f7a94db4e9594fd4b67e715d7b26864b7bd74a75.tar.gz
s390/watchdog: use watchdog API
Converted the vmwatchdog driver to use the kernel's watchdog API. Signed-off-by: Philipp Hachtmann <phacht@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r--drivers/watchdog/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 74ec8fc..daf9441 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1295,9 +1295,10 @@ config WATCHDOG_RTAS
# S390 Architecture
-config ZVM_WATCHDOG
- tristate "z/VM Watchdog Timer"
+config DIAG288_WATCHDOG
+ tristate "System z diag288 Watchdog"
depends on S390
+ select WATCHDOG_CORE
help
IBM s/390 and zSeries machines running under z/VM 5.1 or later
provide a virtual watchdog timer to their guest that cause a
OpenPOWER on IntegriCloud