aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-11 08:50:59 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commit81530d69ef582124f9cc657edacdca9727e805f8 (patch)
treeacfe6765ab312df7f4b5b1ac513a482c808151be /target/linux/ramips
parentd8d8b82c599bd4578471478d79709bc2e3365630 (diff)
downloadupstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.gz
upstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.bz2
upstream-81530d69ef582124f9cc657edacdca9727e805f8.zip
kernel: bump 5.10 to 5.10.121
Manually rebased: oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 706a4ec40cce108f484b40805bfa48619a0a7f09)
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
index 8a704b52c5..a887171139 100644
--- a/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
+++ b/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+};
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -2012,6 +2012,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
+@@ -2021,6 +2021,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_atmel,