diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 18:27:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 18:27:39 -0400 |
| commit | b75cdf388ecdcd5ab5e66178f19c39a4c94dea26 (patch) | |
| tree | 05d5f8dedd0fbd9b93fb10ff6ad9aa81630372f8 /drivers/char | |
| parent | 881787a7d379a4a4474e94fce87b511a7f641595 (diff) | |
| parent | f6af5da388a5d058cd9a5a47d030e3966b22e991 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/watchdog/mpcore_wdt.c | 2 |
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 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 33 | |||
| 34 | #include <asm/hardware/arm_twd.h> | ||
| 33 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 34 | 36 | ||
| 35 | struct mpcore_wdt { | 37 | struct mpcore_wdt { |