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/jack/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-davinci/include/mach/system.h
b/arch/arm/mach-davinci/include/mach/system.h
index
5a7d758
..
e65629c
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/system.h
+++ b/
arch/arm/mach-davinci/include/mach/system.h
@@
-11,7
+11,7
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-extern void davinci_watchdog_reset(void);
+#include <mach/common.h>
static inline void arch_idle(void)
{
static inline void arch_idle(void)
{
@@
-20,7
+20,8
@@
static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
static inline void arch_reset(char mode, const char *cmd)
{
- davinci_watchdog_reset();
+ if (davinci_soc_info.reset)
+ davinci_soc_info.reset(davinci_soc_info.reset_device);
}
#endif /* __ASM_ARCH_SYSTEM_H */
}
#endif /* __ASM_ARCH_SYSTEM_H */