aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-20 14:35:52 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-21 13:23:59 +0200
commit492bd8ddc906cec4a4fffe14f632622c808b90a5 (patch)
tree260d0d41b3acf228ccedb607c74fef2d8afe2419 /target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch
parent0d8d63c038a3f52ee3f537f454c71becd22e6b55 (diff)
downloadupstream-492bd8ddc906cec4a4fffe14f632622c808b90a5.tar.gz
upstream-492bd8ddc906cec4a4fffe14f632622c808b90a5.tar.bz2
upstream-492bd8ddc906cec4a4fffe14f632622c808b90a5.zip
kernel: bump 4.14 to 4.14.71
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch')
-rw-r--r--target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch b/target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch
index f359eb3d78..39eb33ac2c 100644
--- a/target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch
+++ b/target/linux/mvebu/patches-4.14/406-net-mvneta-add-module-EEPROM-reading-support.patch
@@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -4046,6 +4046,22 @@ static int mvneta_ethtool_set_wol(struct
+@@ -4045,6 +4045,22 @@ static int mvneta_ethtool_set_wol(struct
return ret;
}
@@ -33,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static int mvneta_ethtool_get_eee(struct net_device *dev,
struct ethtool_eee *eee)
{
-@@ -4130,6 +4146,8 @@ static const struct ethtool_ops mvneta_e
+@@ -4129,6 +4145,8 @@ static const struct ethtool_ops mvneta_e
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
.get_wol = mvneta_ethtool_get_wol,
.set_wol = mvneta_ethtool_set_wol,