Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-05 21:33:18 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-05 21:33:18 -0700
commitca24660ce7d870bcb06092a0880fab61463c4ea5 (patch)
treec08152a9da9d37b9b9b771c809ba2b4a1d19ba44
parent99185c20cfb9c999826fca0cc6476580d0d593af (diff)
parenta2f5fee9649e2f45dbb381a697f01edcf5514eda (diff)
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
-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 e208b6f07d67..88ba0d29f8c8 100644
--- 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'