net: fec: reorder ethtool ops to match order in struct declaration

This allows us to merge two separate preprocessor conditionals together.

Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 79d578d6db8a408682a509666a84a42f36fcaf46..c6b1bf797a39878e4cd0b1ca4438d22caf5b6438 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2014,21 +2014,19 @@ static int fec_enet_nway_reset(struct net_device *dev)
 }
 
 static const struct ethtool_ops fec_enet_ethtool_ops = {
-#if !defined(CONFIG_M5272)
-       .get_pauseparam         = fec_enet_get_pauseparam,
-       .set_pauseparam         = fec_enet_set_pauseparam,
-#endif
        .get_settings           = fec_enet_get_settings,
        .set_settings           = fec_enet_set_settings,
        .get_drvinfo            = fec_enet_get_drvinfo,
-       .get_link               = ethtool_op_get_link,
-       .get_ts_info            = fec_enet_get_ts_info,
        .nway_reset             = fec_enet_nway_reset,
+       .get_link               = ethtool_op_get_link,
 #ifndef CONFIG_M5272
-       .get_ethtool_stats      = fec_enet_get_ethtool_stats,
+       .get_pauseparam         = fec_enet_get_pauseparam,
+       .set_pauseparam         = fec_enet_set_pauseparam,
        .get_strings            = fec_enet_get_strings,
+       .get_ethtool_stats      = fec_enet_get_ethtool_stats,
        .get_sset_count         = fec_enet_get_sset_count,
 #endif
+       .get_ts_info            = fec_enet_get_ts_info,
 };
 
 static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)