summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-01-09 18:14:43 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-01-09 18:14:43 -0800
commitbdc910332cd5cc406e0ced072fe282b94d2b6595 (patch)
tree7406cbd439fa3df37adf48a7e46ff7de4841a406 /include
parent9cb52295208d6a1b07cf1f6c2ec240f89179a589 (diff)
parent59409421c889f855c1daccef6f53dfc0e9a62129 (diff)
Merge bk://linux-dj.bkbits.net/watchdog
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
-rw-r--r--include/linux/watchdog.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 391779c8b965..e208b6f07d67 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -39,6 +39,7 @@ struct watchdog_info {
#define WDIOF_CARDRESET 0x0020 /* Card previously reset the CPU */
#define WDIOF_POWEROVER 0x0040 /* Power over voltage */
#define WDIOF_SETTIMEOUT 0x0080 /* Set timeout (in seconds) */
+#define WDIOF_MAGICCLOSE 0x0100 /* Supports magic close char */
#define WDIOF_KEEPALIVEPING 0x8000 /* Keep alive ping reply */
#define WDIOS_DISABLECARD 0x0001 /* Turn off the watchdog timer */