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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c6400
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-s3c6400/include/mach/system.h
b/arch/arm/mach-s3c6400/include/mach/system.h
index
090cfd9
..
2e58cb7
100644
(file)
--- a/
arch/arm/mach-s3c6400/include/mach/system.h
+++ b/
arch/arm/mach-s3c6400/include/mach/system.h
@@
-11,6
+11,8
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
+#include <plat/watchdog-reset.h>
+
static void arch_idle(void)
{
/* nothing here yet */
static void arch_idle(void)
{
/* nothing here yet */
@@
-18,7
+20,11
@@
static void arch_idle(void)
static void arch_reset(char mode, const char *cmd)
{
static void arch_reset(char mode, const char *cmd)
{
- /* nothing here yet */
+ if (mode != 's')
+ arch_wdt_reset();
+
+ /* if all else fails, or mode was for soft, jump to 0 */
+ cpu_reset(0);
}
#endif /* __ASM_ARCH_IRQ_H */
}
#endif /* __ASM_ARCH_IRQ_H */