diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
| commit | 9a375e93f88269bb770fb2eaa57554c975449c88 (patch) | |
| tree | 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /arch/m32r/kernel/process.c | |
| parent | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into max-sect
Diffstat (limited to 'arch/m32r/kernel/process.c')
| -rw-r--r-- | arch/m32r/kernel/process.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 5dfc7ea45cf7..065f5e719058 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
| @@ -116,6 +116,10 @@ void cpu_idle (void) | |||
| 116 | 116 | ||
| 117 | void machine_restart(char *__unused) | 117 | void machine_restart(char *__unused) |
| 118 | { | 118 | { |
| 119 | #if defined(CONFIG_PLAT_MAPPI3) | ||
| 120 | outw(1, (unsigned long)PLD_REBOOT); | ||
| 121 | #endif | ||
| 122 | |||
| 119 | printk("Please push reset button!\n"); | 123 | printk("Please push reset button!\n"); |
| 120 | while (1) | 124 | while (1) |
| 121 | cpu_relax(); | 125 | cpu_relax(); |
