summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 15:56:26 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 15:56:26 -0700
commit6d03a68e6d5528630955452ec4b768dbde0dc00c (patch)
tree56e843eec067ddba67fc098196b17e22c56d302f /Documentation
parent0c0e4668e0e65dd1404e8cf066d147235f95561d (diff)
parentcbf40d3f04c2c76a58f1183bb4a9a82fefb842e3 (diff)
downloadlwn-6d03a68e6d5528630955452ec4b768dbde0dc00c.tar.gz
lwn-6d03a68e6d5528630955452ec4b768dbde0dc00c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (33 commits) [WATCHDOG] remove experimental on iTCO_wdt.c [WATCHDOG] Atmel AT91RM9200 rename. [WATCHDOG] includes for sample watchdog program. [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2) [WATCHDOG] add ich8 support to iTCO_wdt.c [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch [WATCHDOG] w83697hf/hg WDT driver - autodetect patch [WATCHDOG] w83697hf/hg WDT driver - patch 16 [WATCHDOG] w83697hf/hg WDT driver - patch 15 [WATCHDOG] w83697hf/hg WDT driver - patch 14 [WATCHDOG] w83697hf/hg WDT driver - patch 13 [WATCHDOG] w83697hf/hg WDT driver - patch 12 [WATCHDOG] w83697hf/hg WDT driver - patch 11 [WATCHDOG] w83697hf/hg WDT driver - patch 10 [WATCHDOG] w83697hf/hg WDT driver - patch 9 [WATCHDOG] w83697hf/hg WDT driver - patch 8 [WATCHDOG] w83697hf/hg WDT driver - patch 7 [WATCHDOG] w83697hf/hg WDT driver - patch 6 ...
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/watchdog/src/watchdog-simple.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/watchdog/src/watchdog-simple.c b/Documentation/watchdog/src/watchdog-simple.c
index 85cf17c48669..47801bc7e742 100644
--- a/Documentation/watchdog/src/watchdog-simple.c
+++ b/Documentation/watchdog/src/watchdog-simple.c
@@ -1,4 +1,6 @@
+#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <fcntl.h>
int main(int argc, const char *argv[]) {