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-ocotp.h
diff --git
a/arch/arm/include/asm/arch-mxs/regs-ocotp.h
b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
index a2ac6a2fbe82e363cd4f7869fdc1481cdfdbce1e..3269892f99dbb8d4797c627eeb5c6efa7650a5f6 100644
(file)
--- a/
arch/arm/include/asm/arch-mxs/regs-ocotp.h
+++ b/
arch/arm/include/asm/arch-mxs/regs-ocotp.h
@@
-29,7
+29,7
@@
#include <asm/arch/regs-common.h>
#ifndef __ASSEMBLY__
-struct mx
28
_ocotp_regs {
+struct mx
s
_ocotp_regs {
mxs_reg_32(hw_ocotp_ctrl) /* 0x0 */
mxs_reg_32(hw_ocotp_data) /* 0x10 */
mxs_reg_32(hw_ocotp_cust0) /* 0x20 */