projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
cpu
/
mips
/
incaip_wdt.S
diff --git
a/cpu/mips/incaip_wdt.S
b/cpu/mips/incaip_wdt.S
index 71adaa19dead2da699688885034291cd894ae780..3ade3cd6fdcafc1a99240ac836c41f5fb36c8b4d 100644
(file)
--- a/
cpu/mips/incaip_wdt.S
+++ b/
cpu/mips/incaip_wdt.S
@@
-24,7
+24,6
@@
#include <config.h>
-#include <version.h>
#include <asm/regdef.h>
@@
-51,7
+50,7
@@
disable_incaip_wdt:
and t3, 0xFFFFFF01
or t3, t2
- or t3, 0xF0
+ or t3, 0xF0
sw t3, WD_CON0(t0) /* write password */
@@
-68,5
+67,5
@@
disable_incaip_wdt:
li t1, WD_WRITE_ENDINIT
sw t1, WD_CON0(t0) /* end command */
- j
ra
+ j
r
ra
nop