diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 16:57:03 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 16:57:03 +0100 |
| commit | ea33fb1a32e8e3f408b311823cabbb7453148f80 (patch) | |
| tree | a81f26a32a32e33c2a25a82423d0bcc8ad48973a /board/keymile/common/common.c | |
| parent | 61bdb9133593f0f881a57232039296f64bd662ed (diff) | |
| parent | bfbfab94fd0b38ca780e6dda99657b0c848c9bb9 (diff) | |
| download | u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.zip u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.gz u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.bz2 | |
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/keymile/common/common.c')
| -rw-r--r-- | board/keymile/common/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index a90f112..6f407b7 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -121,7 +121,7 @@ int i2c_make_abort(void) { #if defined(CONFIG_HARD_I2C) && !defined(MACH_TYPE_KM_KIRKWOOD) - immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; + immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c; /* |