From 4d30ca6788b44b375ea74ea8d0cae61cb754d9e8 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 16 Aug 2012 19:39:41 +0300
Subject: [PATCH] --- yaml --- r: 324308 b: refs/heads/master c:
 c8df72920c9cd8e43899a5660ee54a46ac2588a6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 65cf54599dfe..904072898c48 100644
--- 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
index 3006cca34b16..94f2c0a12d94 100644
--- 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 = {