---

yaml --- r: 311135 b: refs/heads/master c: 49fbd3f h: refs/heads/master i: 311133: 4354805 311131: 69cb56e 311127: 778d503 311119: bfd4ecb 311103: 1583e84 v: v3
git-mirror · Jun 13, 2012 · 058752c · 058752c
1 parent 46a9d05
commit 058752c
Show file tree

Hide file tree

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