aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-20 10:31:41 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-21 09:45:15 +0200
commitf442b306f9b74e805828d458ab412256d7709ffb (patch)
tree9a1fb3b84479a0516f93b8ef8045f333851768ad /target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
parent00324e434e1dbaf7f25d3c85529f92d5917efecb (diff)
downloadupstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.gz
upstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.bz2
upstream-f442b306f9b74e805828d458ab412256d7709ffb.zip
kernel: bump 4.14 to 4.14.120
Refreshed all patches. Remove upstreamed: - 103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch - 060-fix-oxnas-rps-dt-match.patch Altered patches: - 0067-generic-Mangle-bootloader-s-kernel-arguments.patch - 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch - 996-generic-Mangle-bootloader-s-kernel-arguments.patch Compile-tested on: ar71xx, cns3xxx, imx6, mvebu, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch')
-rw-r--r--target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
index 98898fb468..02115c832b 100644
--- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
+++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -1073,6 +1073,14 @@ return ret;
+@@ -1075,6 +1075,14 @@ return ret;
}
static const struct of_device_id sun8i_dwmac_match[] = {