diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/char/watchdog/eurotechwdt.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/char/watchdog/eurotechwdt.c')
| -rw-r--r-- | drivers/char/watchdog/eurotechwdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c index d10e554a14d6..2a29a511df7f 100644 --- a/drivers/char/watchdog/eurotechwdt.c +++ b/drivers/char/watchdog/eurotechwdt.c | |||
| @@ -167,7 +167,7 @@ static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 167 | printk(KERN_CRIT "Would Reboot.\n"); | 167 | printk(KERN_CRIT "Would Reboot.\n"); |
| 168 | #else | 168 | #else |
| 169 | printk(KERN_CRIT "Initiating system reboot.\n"); | 169 | printk(KERN_CRIT "Initiating system reboot.\n"); |
| 170 | machine_restart(NULL); | 170 | emergency_restart(); |
| 171 | #endif | 171 | #endif |
| 172 | return IRQ_HANDLED; | 172 | return IRQ_HANDLED; |
| 173 | } | 173 | } |