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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-iop32x/include/mach/system.h
b/arch/arm/mach-iop32x/include/mach/system.h
index
a4b808f
..
4865a9b
100644
(file)
--- a/
arch/arm/mach-iop32x/include/mach/system.h
+++ b/
arch/arm/mach-iop32x/include/mach/system.h
@@
-30,5
+30,5
@@
static inline void arch_reset(char mode, const char *cmd)
*IOP3XX_PCSR = 0x30;
/* Jump into ROM at address 0 */
-
cpu_rese
t(0);
+
soft_restar
t(0);
}