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]
/
arch
/
arm
/
include
/
asm
/
arch-exynos
/
pwm.h
diff --git
a/arch/arm/include/asm/arch-exynos/pwm.h
b/arch/arm/include/asm/arch-exynos/pwm.h
index d0cf3cb853b84b4fab122752fad43ac8c53f2605..3e951601cdcbcd7e6083c4add83497ab79c53fe0 100644
(file)
--- a/
arch/arm/include/asm/arch-exynos/pwm.h
+++ b/
arch/arm/include/asm/arch-exynos/pwm.h
@@
-57,7
+57,7
@@
struct s5p_timer {
unsigned int tcmpb2;
unsigned int tcnto2;
unsigned int tcntb3;
- unsigned int
res1
;
+ unsigned int
tcmpb3
;
unsigned int tcnto3;
unsigned int tcntb4;
unsigned int tcnto4;