diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/char/watchdog/mixcomwd.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/char/watchdog/mixcomwd.c')
| -rw-r--r-- | drivers/char/watchdog/mixcomwd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c index 7fc2188386d9..d8dede575402 100644 --- a/drivers/char/watchdog/mixcomwd.c +++ b/drivers/char/watchdog/mixcomwd.c | |||
| @@ -45,6 +45,8 @@ | |||
| 45 | #include <linux/fs.h> | 45 | #include <linux/fs.h> |
| 46 | #include <linux/reboot.h> | 46 | #include <linux/reboot.h> |
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/jiffies.h> | ||
| 49 | #include <linux/timer.h> | ||
| 48 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
| 49 | #include <asm/io.h> | 51 | #include <asm/io.h> |
| 50 | 52 | ||