projects
/
platform
/
kernel
/
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
[platform/kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-ls102xa
/
immap_ls102xa.h
diff --git
a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index
f3aaddc
..
3a64afc
100644
(file)
--- a/
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@
-170,8
+170,7
@@
struct ccsr_scfg {
u32 pex1rdmmsgrqsr;
u32 pex2rdmmsgrqsr;
u32 spimsiclrcr;
- u32 pex1mscportsr;
- u32 pex2mscportsr;
+ u32 pexmscportsr[2];
u32 pex2pmwrcr;
u32 resv5[24];
u32 mac1_streamid;