aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/aruba-2.6/files
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-05-24 00:04:19 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-05-24 00:04:19 +0000
commit283bbfc3ffcb263f1106502405c27294f96e2961 (patch)
treedb2ea0d7456cc20d648f4e319e284b0680f0b927 /target/linux/aruba-2.6/files
parenteb62ab0349d569a6c4420b044e5c4b6d7a73bc6c (diff)
downloadmaster-187ad058-283bbfc3ffcb263f1106502405c27294f96e2961.tar.gz
master-187ad058-283bbfc3ffcb263f1106502405c27294f96e2961.tar.bz2
master-187ad058-283bbfc3ffcb263f1106502405c27294f96e2961.zip
aruba fixes, work in progress
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7324 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/aruba-2.6/files')
-rw-r--r--target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c b/target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c
index de966c8699..ef5e52aa04 100644
--- a/target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c
+++ b/target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c
@@ -4,6 +4,8 @@
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/fs.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
#include <asm/io.h>
#include <asm/uaccess.h>