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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-at91
/
at91_wdt.h
diff --git
a/arch/arm/include/asm/arch-at91/at91_wdt.h
b/arch/arm/include/asm/arch-at91/at91_wdt.h
index cf08dafdd8e814f55a740fdf87a96e7ad612e79e..dc22ea1b73d5b98c842a4048228ff0c859beddbc 100644
(file)
--- a/
arch/arm/include/asm/arch-at91/at91_wdt.h
+++ b/
arch/arm/include/asm/arch-at91/at91_wdt.h
@@
-19,7
+19,7
@@
#ifdef __ASSEMBLY__
-#define AT91_ASM_WDT_MR (AT
91_WDT_BASE
+ 0x04)
+#define AT91_ASM_WDT_MR (AT
MEL_BASE_WDT
+ 0x04)
#else