Merge 3.5-rc7 into char-misc-next.

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / misc / mei / wd.c

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 0a893389f6cbfe4716ad9d964fab48a06cc41189..5133fd77b91cc8e01be11736094cd9869b265a86 100644 (file)
--- a/drivers/misc/mei/wd.c
+++ b/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 = {