diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-10 22:04:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-10 22:04:04 +0100 |
| commit | 3c92217732edfc0016c3cbdc828471d013d23a36 (patch) | |
| tree | f695fd402c8cd78b0d5f1e66a0e2ca17c7f7d146 /include | |
| parent | b5a15c90a6f1230723c4e887a707d9c41ac3f4e2 (diff) | |
| parent | 0452352df118bc9dd684a056aaaa5fb4aed1178a (diff) | |
| download | u-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.zip u-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.tar.gz u-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/immap_85xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 7b97fe0..094fb9c 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -1667,7 +1667,7 @@ typedef struct ccsr_gur { uint lbiuiplldcr0; /* 0xe0f1c -- LBIU PLL Debug Reg 0 */ uint lbiuiplldcr1; /* 0xe0f20 -- LBIU PLL Debug Reg 1 */ uint ddrioovcr; /* 0xe0f24 - DDR IO Override Control */ - uint res14; /* 0xe0f28 */ + uint tsec12ioovcr; /* 0xe0f28 - eTSEC 1/2 IO override control */ uint tsec34ioovcr; /* 0xe0f2c - eTSEC 3/4 IO override control */ char res15[61648]; /* 0xe0f30 to 0xefffff */ } ccsr_gur_t; |