diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
| commit | 08ca213acadef61748dc62d48b0f5c4bed8b8c2d (patch) | |
| tree | 36cf415b78775ee63acdfc34d636d2b7d7936a78 /arch/powerpc/include/asm/immap_86xx.h | |
| parent | d15a244b059e361475302bccd471e65a48ee2b1f (diff) | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| download | blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.tar.gz blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/powerpc/include/asm/immap_86xx.h')
| -rw-r--r-- | arch/powerpc/include/asm/immap_86xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h index 177918b7f9..b078569c45 100644 --- a/arch/powerpc/include/asm/immap_86xx.h +++ b/arch/powerpc/include/asm/immap_86xx.h @@ -92,8 +92,8 @@ typedef struct ccsr_local_mcm { /* Daul I2C Registers(0x3000-0x4000) */ typedef struct ccsr_i2c { - struct fsl_i2c i2c[2]; - u8 res[4096 - 2 * sizeof(struct fsl_i2c)]; + struct fsl_i2c_base i2c[2]; + u8 res[4096 - 2 * sizeof(struct fsl_i2c_base)]; } ccsr_i2c_t; /* DUART Registers(0x4000-0x5000) */ |
