diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /drivers/serial/68328serial.c | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | } |