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-clps711x
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-clps711x/include/mach/system.h
b/arch/arm/mach-clps711x/include/mach/system.h
index
f916cd7
..
6c11993
100644
(file)
--- a/
arch/arm/mach-clps711x/include/mach/system.h
+++ b/
arch/arm/mach-clps711x/include/mach/system.h
@@
-34,7
+34,7
@@
static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
-
cpu_rese
t(0);
+
soft_restar
t(0);
}
#endif