---

yaml --- r: 309387 b: refs/heads/master c: 2bbeed0 h: refs/heads/master i: 309385: 3c45834 309383: 2083df3 v: v3
git-mirror · May 30, 2012 · 4f59f73 · 4f59f73
1 parent 720e1b1
commit 4f59f73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f5fed30a6460ec58f159ff297a2974153a97de
+refs/heads/master: 2bbeed016dd96045ec82c3a309afddcc3a0db1d2
diff --git a/trunk/include/linux/watchdog.h b/trunk/include/linux/watchdog.h
@@ -45,6 +45,8 @@ struct watchdog_info {
 #define	WDIOF_SETTIMEOUT	0x0080  /* Set timeout (in seconds) */
 #define	WDIOF_MAGICCLOSE	0x0100	/* Supports magic close char */
 #define	WDIOF_PRETIMEOUT	0x0200  /* Pretimeout (in seconds), get/set */
+#define	WDIOF_ALARMONLY		0x0400	/* Watchdog triggers a management or
+					   other external alarm not a reboot */
 #define	WDIOF_KEEPALIVEPING	0x8000	/* Keep alive ping reply */
 
 #define	WDIOS_DISABLECARD	0x0001	/* Turn off the watchdog timer */