diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
| commit | a670fcb43f01a67ef56176afc76e5d43d128b25c (patch) | |
| tree | 09c9411c78a33ff980e9ea871bc7686e7589abbf /drivers/serial/68328serial.c | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'drivers/serial/68328serial.c')
| -rw-r--r-- | drivers/serial/68328serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index d27fb4c881d2..9097f2f7b12a 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
| @@ -316,7 +316,7 @@ static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *reg | |||
| 316 | /* show_net_buffers(); */ | 316 | /* show_net_buffers(); */ |
| 317 | return; | 317 | return; |
| 318 | } else if (ch == 0x12) { /* ^R */ | 318 | } else if (ch == 0x12) { /* ^R */ |
| 319 | machine_restart(NULL); | 319 | emergency_restart(); |
| 320 | return; | 320 | return; |
| 321 | #endif /* CONFIG_MAGIC_SYSRQ */ | 321 | #endif /* CONFIG_MAGIC_SYSRQ */ |
| 322 | } | 322 | } |