Merge branch 'mpc85xx'

Conflicts:

	drivers/tsec.c

diff --cc drivers/tsec.c
index a8a2ba2f52969da5f5879a6261184a4f7592da24,bfc49c46297d376a78a2d8f11db726bf9e9d23c2..0fb3ca229cbbcbee9559eb31ce54c69e6ebbfe71
--- 1/drivers/tsec.c
--- 2/drivers/tsec.c
+++ b/drivers/tsec.c
@@@ -90,18 -81,16 +86,16 @@@ static struct tsec_info_struct tsec_inf
  #ifdef CONFIG_MPC85XX_FEC
        {FEC_PHY_ADDR, 0, FEC_PHYIDX},
  #else
 -#    if defined(CONFIG_MPC85XX_TSEC3) || defined(CONFIG_MPC83XX_TSEC3)
 +#if defined(CONFIG_MPC85XX_TSEC3) || defined(CONFIG_MPC83XX_TSEC3) || defined(CONFIG_MPC86XX_TSEC3)
        {TSEC3_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC3_PHYIDX},
 -#    else
 +#else
        { 0, 0, 0},
 -#    endif
 -#    if defined(CONFIG_MPC85XX_TSEC4) || defined(CONFIG_MPC83XX_TSEC4)
 +#endif
- #if defined(CONFIG_MPC85XX_TSEC4) || defined(CONFIG_MPC83XX_TSEC4)
-       {TSEC4_PHY_ADDR, TSEC_REDUCED, TSEC4_PHYIDX},
- #elif defined(CONFIG_MPC86XX_TSEC4)
-        {TSEC4_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC4_PHYIDX},
++#if defined(CONFIG_MPC85XX_TSEC4) || defined(CONFIG_MPC83XX_TSEC4) || defined(CONFIG_MPC86XX_TSEC4)
+       {TSEC4_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC4_PHYIDX},
 -#    else
 +#else
        { 0, 0, 0},
 -#    endif
 +#endif
  #endif
  };
  
@@@ -1055,9 -1047,9 +1101,10 @@@ struct phy_info *phy_info[] = 
        &phy_info_cis8204,
        &phy_info_M88E1011S,
        &phy_info_M88E1111S,
+       &phy_info_M88E1145,
        &phy_info_dm9161,
        &phy_info_lxt971,
 +      &phy_info_VSC8244,
        &phy_info_dp83865,
        NULL
  };

diff --cc drivers/tsec.h
Simple merge