diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 05:13:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 05:13:00 -0700 |
| commit | 672a483050bd4fa733fb5854bd749d124f3e32a8 (patch) | |
| tree | af0269fd73241e69e7ffcf9ffa346d0b79e5c120 /Documentation | |
| parent | 786501bbcef901e24a6648fe59017392df3ed1bf (diff) | |
| parent | 1f315b72ad795de4d971f675ba26f4387fadff79 (diff) | |
| download | history-672a483050bd4fa733fb5854bd749d124f3e32a8.tar.gz | |
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/watchdog/pcwd-watchdog.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/watchdog/pcwd-watchdog.txt b/Documentation/watchdog/pcwd-watchdog.txt index a586667aa67c72..12187a33e31021 100644 --- a/Documentation/watchdog/pcwd-watchdog.txt +++ b/Documentation/watchdog/pcwd-watchdog.txt @@ -35,7 +35,8 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> -#include <linux/pcwd.h> +#include <linux/types.h> +#include <linux/watchdog.h> int fd; |