git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
process.c
diff --git
a/arch/m32r/kernel/process.c
b/arch/m32r/kernel/process.c
index
5dfc7ea
..
44cbe0c
100644
(file)
--- a/
arch/m32r/kernel/process.c
+++ b/
arch/m32r/kernel/process.c
@@
-21,7
+21,6
@@
*/
#include <linux/fs.h>
*/
#include <linux/fs.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/module.h>
#include <linux/ptrace.h>
#include <linux/unistd.h>
@@
-116,6
+115,10
@@
void cpu_idle (void)
void machine_restart(char *__unused)
{
void machine_restart(char *__unused)
{
+#if defined(CONFIG_PLAT_MAPPI3)
+ outw(1, (unsigned long)PLD_REBOOT);
+#endif
+
printk("Please push reset button!\n");
while (1)
cpu_relax();
printk("Please push reset button!\n");
while (1)
cpu_relax();