};
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -1058,34 +1058,6 @@ int phylink_ethtool_set_pauseparam(struc
+@@ -1060,34 +1060,6 @@ int phylink_ethtool_set_pauseparam(struc
}
EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);
#include <linux/slab.h>
#include <linux/rtnetlink.h>
#include <linux/sched/signal.h>
-@@ -2212,6 +2213,9 @@ static int __ethtool_get_module_info(str
+@@ -2214,6 +2215,9 @@ static int __ethtool_get_module_info(str
const struct ethtool_ops *ops = dev->ethtool_ops;
struct phy_device *phydev = dev->phydev;
if (phydev && phydev->drv && phydev->drv->module_info)
return phydev->drv->module_info(phydev, modinfo);
-@@ -2246,6 +2250,9 @@ static int __ethtool_get_module_eeprom(s
+@@ -2248,6 +2252,9 @@ static int __ethtool_get_module_eeprom(s
const struct ethtool_ops *ops = dev->ethtool_ops;
struct phy_device *phydev = dev->phydev;