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-mmp
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-mmp/include/mach/system.h
b/arch/arm/mach-mmp/include/mach/system.h
index
1a8a25e
..
cb06379
100644
(file)
--- a/
arch/arm/mach-mmp/include/mach/system.h
+++ b/
arch/arm/mach-mmp/include/mach/system.h
@@
-19,8
+19,8
@@
static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
if (cpu_is_pxa168())
-
cpu_rese
t(0xffff0000);
+
soft_restar
t(0xffff0000);
else
-
cpu_rese
t(0);
+
soft_restar
t(0);
}
#endif /* __ASM_MACH_SYSTEM_H */