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-x86
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-s5pc1xx
/
cpu.h
diff --git
a/arch/arm/include/asm/arch-s5pc1xx/cpu.h
b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
index e699fc47c04391de5f0df1255b4581bbe9627d5b..510ead4d993c6b14523f4ffd975cf6596a7ad19f 100644
(file)
--- a/
arch/arm/include/asm/arch-s5pc1xx/cpu.h
+++ b/
arch/arm/include/asm/arch-s5pc1xx/cpu.h
@@
-98,6
+98,7
@@
SAMSUNG_BASE(mmc, MMC_BASE)
SAMSUNG_BASE(sromc, SROMC_BASE)
SAMSUNG_BASE(timer, PWMTIMER_BASE)
SAMSUNG_BASE(uart, UART_BASE)
+SAMSUNG_BASE(watchdog, WATCHDOG_BASE)
#endif
#endif /* _S5PC1XX_CPU_H */