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

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
ca24660c · Linus Torvalds · 99185c20 · a2f5fee9 · ca24660c
Commit ca24660c authored Jun 05, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/linux/watchdog.h include/linux/watchdog.h +1 -0

No files found.
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -10,6 +10,7 @@
 #define _LINUX_WATCHDOG_H

 #include <linux/ioctl.h>
+#include <linux/types.h>

 #define	WATCHDOG_IOCTL_BASE	'W'