From 058752c3f0d9b931b7dcb497e88faa5cd53a1cfc Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 11 Jun 2012 12:18:31 +0300
Subject: [PATCH] --- yaml --- r: 311135 b: refs/heads/master c:
 49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6 h: refs/heads/master i:   311133:
 43548055103a6b24bcb58f414d22fb44d655d150   311131:
 69cb56e40867df4ff038e13900c5426c882a468e   311127:
 778d503633b0a907016592d8bca09715c6f15d62   311119:
 bfd4ecbc6d2af5033d42cabc811c4b2a3ff02ef4   311103:
 1583e84c9153592422d204449c5d80509a47fbfb v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/misc/mei/wd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9558e81c7a59..71db909791da 100644
--- 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
index 6be5605707b4..e2ec0505eb5c 100644
--- 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 = {