aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorXu Wang <gesaint@linux.vnet.ibm.com>2015-03-06 16:26:29 +0800
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 11:49:41 +0100
commit9ec6cb80c8752db70174d3f67d33243fbab05014 (patch)
tree31110112e9c366e8a0b958ea833df1895ca0fb0b /drivers/watchdog
parents390/dasd: remove setting of scheduler from driver (diff)
downloadlinux-dev-9ec6cb80c8752db70174d3f67d33243fbab05014.tar.xz
linux-dev-9ec6cb80c8752db70174d3f67d33243fbab05014.zip
s390/watchdog: enable KEEPALIVE for /dev/watchdog
There's no reason why we wouldn't want to be able to send a keep alive message to /dev/watchdog (feed dog) for the s390 diag288 watchdog, so let's enable the WDIOF_KEEPALIVEPING option. Signed-off-by: Xu Wang <gesaint@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/diag288_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/diag288_wdt.c b/drivers/watchdog/diag288_wdt.c
index 429494b6c822..480cedd41d09 100644
--- a/drivers/watchdog/diag288_wdt.c
+++ b/drivers/watchdog/diag288_wdt.c
@@ -202,7 +202,7 @@ static struct watchdog_ops wdt_ops = {
};
static struct watchdog_info wdt_info = {
- .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
.firmware_version = 0,
.identity = "z Watchdog",
};