aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-05-15 16:21:46 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-15 19:32:20 +0200
commit9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff (patch)
tree583c92bf887bbd32e6a2ebfae54d888ceb7ba556 /target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
parentc287500a656e43da45b203fb3c4463d9089c5986 (diff)
downloadupstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.tar.gz
upstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.tar.bz2
upstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.zip
kernel: bump 5.4 to 5.4.119
Removed because in upstream generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch ath79/patches-5.4/0050-spi-ath79-remove-spi-master-setup-and-cleanup-assign.patch ramips/patches-5.4/999-fix-pci-init-mt7620.patch Manually rebased ath79/patches-5.4/0033-spi-ath79-drop-pdata-support.patch All others updated automatically. Compile-tested on: x86/64, ath79/generic Runtime-tested on: x86/64, ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch')
-rw-r--r--target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch b/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
index 2a6b9857fb..51a71c6ef2 100644
--- a/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
+++ b/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
@@ -58,7 +58,7 @@ Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
static int ath79_spi_probe(struct platform_device *pdev)
{
struct spi_master *master;
-@@ -163,6 +197,7 @@ static int ath79_spi_probe(struct platfo
+@@ -164,6 +198,7 @@ static int ath79_spi_probe(struct platfo
ret = PTR_ERR(sp->base);
goto err_put_master;
}