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-w90x900
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-w90x900/include/mach/system.h
b/arch/arm/mach-w90x900/include/mach/system.h
index
ce228bd
..
68875a1
100644
(file)
--- a/
arch/arm/mach-w90x900/include/mach/system.h
+++ b/
arch/arm/mach-w90x900/include/mach/system.h
@@
-33,7
+33,7
@@
static void arch_reset(char mode, const char *cmd)
{
if (mode == 's') {
/* Jump into ROM at address 0 */
-
cpu_rese
t(0);
+
soft_restar
t(0);
} else {
__raw_writel(WTE | WTRE | WTCLK, WTCR);
}