Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

2005-09-14 15:27:39 -07:00
parent 881787a7d3 f6af5da388
commit b75cdf388e
2 changed files with 18 additions and 0 deletions
--- 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 {