aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/scx200_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2009-05-11 18:33:00 +0000
committerWim Van Sebroeck <wim@iguana.be>2009-06-18 07:30:57 +0000
commite73a780272a46e897bd94a4870fd6b6a8655d2d4 (patch)
tree514890ee239af2ddd97a0ac130df6af11013dcf0 /drivers/watchdog/scx200_wdt.c
parent[WATCHDOG] move platform probe and remove function to devinit and devexit (diff)
downloadlinux-dev-e73a780272a46e897bd94a4870fd6b6a8655d2d4.tar.xz
linux-dev-e73a780272a46e897bd94a4870fd6b6a8655d2d4.zip
[WATCHDOG] Correct WDIOF_MAGICCLOSE flag
Make sure that when the WDIOF_MAGICCLOSE flag is set we also support the magic-close feature... Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/scx200_wdt.c')
-rw-r--r--drivers/watchdog/scx200_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c
index ea93692a110a..e67b76c0526c 100644
--- a/drivers/watchdog/scx200_wdt.c
+++ b/drivers/watchdog/scx200_wdt.c
@@ -165,7 +165,8 @@ static long scx200_wdt_ioctl(struct file *file, unsigned int cmd,
static const struct watchdog_info ident = {
.identity = "NatSemi SCx200 Watchdog",
.firmware_version = 1,
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
};
int new_margin;