aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-12-23 21:46:17 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-24 17:45:54 +0100
commit25b422a0412d88345c911875fd4413c46c913d4e (patch)
tree74339fb2ca8a7aa94d2530295df9a459ab77ba7f /target/linux/mvebu
parentf0df0d6a1472d8d3692998de6b42bd17287d04e9 (diff)
downloadupstream-25b422a0412d88345c911875fd4413c46c913d4e.tar.gz
upstream-25b422a0412d88345c911875fd4413c46c913d4e.tar.bz2
upstream-25b422a0412d88345c911875fd4413c46c913d4e.zip
kernel: bump 4.14 to 4.14.160
Refreshed all patches. Compile-tested on: ipq40xx, apm821xx Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
index 2e4be1bc48..19f8f1e632 100644
--- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
+++ b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
@@ -129,7 +129,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/* 802.11 specific */
struct wireless_dev;
/* 802.15.4 specific */
-@@ -1935,6 +1936,7 @@ struct net_device {
+@@ -1940,6 +1941,7 @@ struct net_device {
struct netprio_map __rcu *priomap;
#endif
struct phy_device *phydev;