projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of ../next
[platform/kernel/u-boot.git]
/
arch
/
m68k
/
cpu
/
mcf52x2
/
cpu.c
diff --git
a/arch/m68k/cpu/mcf52x2/cpu.c
b/arch/m68k/cpu/mcf52x2/cpu.c
index
d43ef2a
..
571d078
100644
(file)
--- a/
arch/m68k/cpu/mcf52x2/cpu.c
+++ b/
arch/m68k/cpu/mcf52x2/cpu.c
@@
-74,8
+74,7
@@
int watchdog_disable(void)
{
volatile wdog_t *wdt = (volatile wdog_t *)(MMAP_WDOG);
{
volatile wdog_t *wdt = (volatile wdog_t *)(MMAP_WDOG);
- wdt->sr = 0x5555; /* reset watchdog counteDECLARE_GLOBAL_DATA_PTR;
-r */
+ wdt->sr = 0x5555; /* reset watchdog counter */
wdt->sr = 0xAAAA;
wdt->cr = 0; /* disable watchdog timer */
wdt->sr = 0xAAAA;
wdt->cr = 0; /* disable watchdog timer */