Commit ca24660c authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 99185c20 a2f5fee9
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define _LINUX_WATCHDOG_H #define _LINUX_WATCHDOG_H
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h>
#define WATCHDOG_IOCTL_BASE 'W' #define WATCHDOG_IOCTL_BASE 'W'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment