Merge 3.5-rc7 into char-misc-next.

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / misc / mei / wd.c

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 0a89338..5133fd7 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 = {