summaryrefslogtreecommitdiff
path: root/include/mpc512x.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-18 21:59:44 +0200
committerWolfgang Denk <wd@denx.de>2008-10-18 21:59:44 +0200
commitf82642e33899766892499b163e60560fbbf87773 (patch)
treeab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/mpc512x.h
parentb59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff)
parent360fe71e82b83e264c964c9447c537e9a1f643c8 (diff)
downloadu-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip
u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz
u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2
Merge 'next' branch
Conflicts: board/freescale/mpc8536ds/mpc8536ds.c include/configs/mgcoge.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/mpc512x.h')
-rw-r--r--include/mpc512x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mpc512x.h b/include/mpc512x.h
index cb418d1..05a2063 100644
--- a/include/mpc512x.h
+++ b/include/mpc512x.h
@@ -572,7 +572,7 @@ void iopin_initialize(iopin_t *,int);
#define IOCTRL_MUX_DDR 0x00000036
/* Register Offset Base */
-#define MPC512X_FEC (CFG_IMMR + 0x02800)
+#define MPC512X_FEC (CONFIG_SYS_IMMR + 0x02800)
/* Number of I2C buses */
#define I2C_BUS_CNT 3