From 4f59f7376d222b36acb68b3a36e2adeefe7b2e71 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 11 May 2012 12:00:19 +0200 Subject: [PATCH] --- yaml --- r: 309387 b: refs/heads/master c: 2bbeed016dd96045ec82c3a309afddcc3a0db1d2 h: refs/heads/master i: 309385: 3c458341a5eb1276f21f6f38a68d47b71c2abb1d 309383: 2083df327644741e00c07c2aa71ffdd3d659a338 v: v3 --- [refs] | 2 +- trunk/include/linux/watchdog.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b1e68580fa14..bac5af07329b 100644 --- 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 index 508d56399e6d..32678a50f98d 100644 --- 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 */