From: David S. Miller <davem@davemloft.net>
Date: Wed, 7 Dec 2016 02:33:19 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c63d352f053a788281eb90df0a71cd3a6b2c4040;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

c63d352f053a788281eb90df0a71cd3a6b2c4040
diff --cc drivers/net/ethernet/freescale/fec_main.c
index ecaa7a90b7c8,12aef1b15356..38160c2bebcb
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -2352,8 -2357,24 +2354,14 @@@ static int fec_enet_get_sset_count(stru
  		return -EOPNOTSUPP;
  	}
  }
+ 
+ #else	/* !defined(CONFIG_M5272) */
+ #define FEC_STATS_SIZE	0
+ static inline void fec_enet_update_ethtool_stats(struct net_device *dev)
+ {
+ }
  #endif /* !defined(CONFIG_M5272) */
  
 -static int fec_enet_nway_reset(struct net_device *dev)
 -{
 -	struct phy_device *phydev = dev->phydev;
 -
 -	if (!phydev)
 -		return -ENODEV;
 -
 -	return genphy_restart_aneg(phydev);
 -}
 -
  /* ITR clock source is enet system clock (clk_ahb).
   * TCTT unit is cycle_ns * 64 cycle
   * So, the ICTT value = X us / (cycle_ns * 64)