Merge with /home/wd/git/u-boot/custodian/u-boot-testing

[karo-tx-uboot.git] / cpu / mpc5xxx / fec.c

diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c
index 727f954e3ae37f87b1ab58fffbe6530070c8ce76..1a4d2f2e26074b410e232c1036924cc693c0dcb8 100644 (file)
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -889,13 +889,20 @@ int mpc5xxx_fec_initialize(bd_t * bis)
        fec->eth = (ethernet_regs *)MPC5XXX_FEC;
        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_HMI1001)        || \
-    defined(CONFIG_ICECUBE)  || defined(CONFIG_INKA4X0)        || \
-    defined(CONFIG_JUPITER)  || defined(CONFIG_MCC200) || \
-    defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT)  || \
-    defined(CONFIG_PM520)    || defined(CONFIG_TOP5200)        || \
-    defined(CONFIG_TQM5200)  || defined(CONFIG_UC101)  || \
-    defined(CONFIG_V38B)
+#if defined(CONFIG_CANMB)              || \
+       defined(CONFIG_CM1_QP1)         || \
+       defined(CONFIG_HMI1001)         || \
+       defined(CONFIG_ICECUBE)         || \
+       defined(CONFIG_INKA4X0)         || \
+       defined(CONFIG_JUPITER)         || \
+       defined(CONFIG_MCC200)          || \
+       defined(CONFIG_MOTIONPRO)       || \
+       defined(CONFIG_O2DNT)           || \
+       defined(CONFIG_PM520)           || \
+       defined(CONFIG_TOP5200)         || \
+       defined(CONFIG_TQM5200)         || \
+       defined(CONFIG_UC101)           || \
+       defined(CONFIG_V38B)
 # ifndef CONFIG_FEC_10MBIT
        fec->xcv_type = MII100;
 # else