aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-05-21 06:29:01 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-23 15:09:06 +0200
commitfec92f1ec3d200b0e6ffa299f331a979c7a30a44 (patch)
tree1dd43556417007b0dc1e7e65a84acdea069b4662 /target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
parent08593db128c4472225a7ffd58e21f06390d9c3f0 (diff)
downloadupstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.tar.gz
upstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.tar.bz2
upstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.zip
kernel: bump 5.4 to 5.4.120
Removed upstreamed: generic/pending-5.4/770-02-net-ethernet-mtk_eth_soc-fix-rx-vlan-offload.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Note that since I rebased the previous commit, I removed my Run-tested line although I confirm building the image successfully. Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch')
-rw-r--r--target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
index 585bd62a58..54488f25a8 100644
--- a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
+++ b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
@@ -163,7 +163,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
mutex_unlock(&tzd->lock);
return tzd;
-@@ -762,7 +802,10 @@ static const char * const trip_types[] =
+@@ -765,7 +805,10 @@ static const char * const trip_types[] =
[THERMAL_TRIP_ACTIVE] = "active",
[THERMAL_TRIP_PASSIVE] = "passive",
[THERMAL_TRIP_HOT] = "hot",