diff options
author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:33 +0100 |
---|---|---|
committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:33 +0100 |
commit | 7625b23cfeb16a3dc9227467db6a4e7d3eed0908 (patch) | |
tree | 14cf007cdbae318a6a04426e38e2fa88a2e1201f /drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | |
parent | 59fa404bcafda5ddaf72c8a7be8181c88a8e3ce3 (diff) | |
parent | 12bbe31f56df7fc344f6a14d313396d4675968ee (diff) |
Merge branches 'mvebu-cpuidle' and 'mvneta' into clearfog
Diffstat (limited to 'drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c')
-rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 71439825ea4e..ecbe3994f2b1 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -130,7 +130,6 @@ bool sxgbe_eee_init(struct sxgbe_priv_data * const priv) if (phy_init_eee(ndev->phydev, true)) return false; - priv->eee_active = 1; timer_setup(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer, 0); priv->eee_ctrl_timer.expires = SXGBE_LPI_TIMER(eee_timer); add_timer(&priv->eee_ctrl_timer); |