---

yaml --- r: 324308 b: refs/heads/master c: c8df729 h: refs/heads/master v: v3
git-mirror · Aug 16, 2012 · 4d30ca6 · 4d30ca6
1 parent 62fbd9c
commit 4d30ca6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bb3a5897e22bf6af82bc451db9458b1d794f627
+refs/heads/master: c8df72920c9cd8e43899a5660ee54a46ac2588a6
diff --git a/trunk/drivers/misc/mei/wd.c b/trunk/drivers/misc/mei/wd.c
@@ -341,7 +341,9 @@ static const struct watchdog_ops wd_ops = {
 };
 static const struct watchdog_info wd_info = {
 		.identity = INTEL_AMT_WATCHDOG_ID,
-		.options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY,
+		.options = WDIOF_KEEPALIVEPING |
+			   WDIOF_SETTIMEOUT |
+			   WDIOF_ALARMONLY,
 };
 
 static struct watchdog_device amt_wd_dev = {