summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-06-07 08:49:46 -0500
committerJon Loeliger <jdl@freescale.com>2006-06-07 08:49:46 -0500
commita941b832411ef99351a42be23ff3319643dcc1a4 (patch)
tree1cdaa7e1e82679a5acf20676960df2b0d91d94b2 /include/asm-ppc
parent72ed528a948b151e7be5ce03ed3d2b88a229dd0a (diff)
parentc83ae9ea6d93abbe751bf8a3396236a084e56f87 (diff)
downloadu-boot-imx-a941b832411ef99351a42be23ff3319643dcc1a4.zip
u-boot-imx-a941b832411ef99351a42be23ff3319643dcc1a4.tar.gz
u-boot-imx-a941b832411ef99351a42be23ff3319643dcc1a4.tar.bz2
Merge branch 'mpc86xx'
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/immap_86xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h
index 6bbe072..9e81b47 100644
--- a/include/asm-ppc/immap_86xx.h
+++ b/include/asm-ppc/immap_86xx.h
@@ -52,7 +52,7 @@ typedef struct ccsr_local_mcm {
uint lawbar7; /* 0xce8 - Local Access Window 7 Base Address Register */
char res19[4];
uint lawar7; /* 0xcf0 - Local Access Window 7 Attributes Register */
- char res20[16];
+ char res20[20];
uint lawbar8; /* 0xd08 - Local Access Window 8 Base Address Register */
char res21[4];
uint lawar8; /* 0xd10 - Local Access Window 8 Attributes Register */
@@ -60,7 +60,7 @@ typedef struct ccsr_local_mcm {
uint lawbar9; /* 0xd28 - Local Access Window 9 Base Address Register */
char res23[4];
uint lawar9; /* 0xd30 - Local Access Window 9 Attributes Register */
- char res24[720];
+ char res24[716];
uint abcr; /* 0x1000 - MCM CCB Address Configuration Register */
char res25[4];
uint dbcr; /* 0x1008 - MCM MPX data bus Configuration Register */