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-mxs
/
regs-timrot.h
diff --git
a/arch/arm/include/asm/arch-mxs/regs-timrot.h
b/arch/arm/include/asm/arch-mxs/regs-timrot.h
index 332654f6ee0153eb3d2d349decf69bef1e90e875..529a3bcdd1c9ec105e54c02fb617ed578ce5254c 100644
(file)
--- a/
arch/arm/include/asm/arch-mxs/regs-timrot.h
+++ b/
arch/arm/include/asm/arch-mxs/regs-timrot.h
@@
-28,7
+28,7
@@
#include <asm/arch/regs-common.h>
#ifndef __ASSEMBLY__
-struct mx
28
_timrot_regs {
+struct mx
s
_timrot_regs {
mxs_reg_32(hw_timrot_rotctrl)
mxs_reg_32(hw_timrot_rotcount)
mxs_reg_32(hw_timrot_timctrl0)