summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-15 00:27:39 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-15 00:27:39 +0200
commitb75cdf388ecdcd5ab5e66178f19c39a4c94dea26 (patch)
tree05d5f8dedd0fbd9b93fb10ff6ad9aa81630372f8 /drivers/char
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
parent[ARM SMP] Add timer/watchdog defines for MPCore (diff)
downloadlinux-b75cdf388ecdcd5ab5e66178f19c39a4c94dea26.tar.xz
linux-b75cdf388ecdcd5ab5e66178f19c39a4c94dea26.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/mpcore_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index c694eee1fb24..75ca84ed4adf 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -30,6 +30,8 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/device.h>
+
+#include <asm/hardware/arm_twd.h>
#include <asm/uaccess.h>
struct mpcore_wdt {