summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2007-08-07 21:33:33 -0400
committerGerald Van Baren <vanbaren@cideas.com>2007-08-07 21:33:33 -0400
commited8e5f362a2fc572eb9c1854f6c76c291b0f9a0f (patch)
tree1a4ac282961db74b9a80fbe5ca51f3bca47d27ab /cpu
parent7c4c3722a38d40b0cf537ddae72b04f4088b190c (diff)
parentb23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff)
downloadu-boot-imx-ed8e5f362a2fc572eb9c1854f6c76c291b0f9a0f.zip
u-boot-imx-ed8e5f362a2fc572eb9c1854f6c76c291b0f9a0f.tar.gz
u-boot-imx-ed8e5f362a2fc572eb9c1854f6c76c291b0f9a0f.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc5xxx/fec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c
index 1a4d2f2..1d3da77 100644
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -890,7 +890,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
#if defined(CONFIG_CANMB) || \
- defined(CONFIG_CM1_QP1) || \
+ defined(CONFIG_CM5200) || \
defined(CONFIG_HMI1001) || \
defined(CONFIG_ICECUBE) || \
defined(CONFIG_INKA4X0) || \