aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-17 05:58:14 -0500
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-02-19 07:15:59 +0100
commit76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (patch)
tree60fd91fe322d516bfd5147bf33019c03c8ad32e8 /target/linux/ramips
parentcbe4beb442e10f9ad8fc71202e87c15a0859c44c (diff)
downloadupstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.gz
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.bz2
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.zip
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains. No manual changes needed. Build system: x86_64 Build-tested: bcm27xx/bcm2711 Signed-off-by: John Audia <graysky@archlinux.us> (cherry-picked from commit 5d3a6fd970)
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch b/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
index e59044dd96..bdf98f223c 100644
--- a/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
+++ b/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
@@ -23,11 +23,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/ralink/reset.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
-index 8126f12604071..274d33078c5eb 100644
--- a/arch/mips/ralink/reset.c
+++ b/arch/mips/ralink/reset.c
-@@ -27,7 +27,7 @@ static int ralink_assert_device(struct reset_controller_dev *rcdev,
+@@ -27,7 +27,7 @@ static int ralink_assert_device(struct r
{
u32 val;
@@ -36,7 +34,7 @@ index 8126f12604071..274d33078c5eb 100644
return -1;
val = rt_sysc_r32(SYSC_REG_RESET_CTRL);
-@@ -42,7 +42,7 @@ static int ralink_deassert_device(struct reset_controller_dev *rcdev,
+@@ -42,7 +42,7 @@ static int ralink_deassert_device(struct
{
u32 val;