diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /include/linux/watchdog.h | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'include/linux/watchdog.h')
| -rw-r--r-- | include/linux/watchdog.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 3f358258b..8d7a7764d 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -6,14 +6,17 @@ * */ +#ifndef _LINUX_WATCHDOG_H +#define _LINUX_WATCHDOG_H + #include <linux/ioctl.h> #define WATCHDOG_IOCTL_BASE 'W' struct watchdog_info { - u32 options; /* Options the card/driver supports */ - u32 firmware_version; /* Firmware version of the card */ - u8 identity[32]; /* Identity of the board */ + __u32 options; /* Options the card/driver supports */ + __u32 firmware_version; /* Firmware version of the card */ + __u8 identity[32]; /* Identity of the board */ }; #define WDIOC_GETSUPPORT _IOR(WATCHDOG_IOCTL_BASE, 0, struct watchdog_info) @@ -38,3 +41,5 @@ struct watchdog_info { #define WDIOS_DISABLECARD 0x0001 /* Turn off the watchdog timer */ #define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */ #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ + +#endif /* ifndef _LINUX_WATCHDOG_H */ |