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/pcwd.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/char/watchdog/pcwd.c')
| -rw-r--r-- | drivers/char/watchdog/pcwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c index 427ad51b7a35..37c9e13ad3ac 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | #include <linux/init.h> | 66 | #include <linux/init.h> |
| 67 | #include <linux/spinlock.h> | 67 | #include <linux/spinlock.h> |
| 68 | #include <linux/reboot.h> | 68 | #include <linux/reboot.h> |
| 69 | 69 | #include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */ | |
| 70 | #include <asm/uaccess.h> | 70 | #include <asm/uaccess.h> |
| 71 | #include <asm/io.h> | 71 | #include <asm/io.h> |
| 72 | 72 | ||