summaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-02 21:52:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-02 21:52:41 +0000
commitf0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (patch)
treef4e3850683bbb922227f58993e41a4784a670932 /target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch
parent40a09b93d274737c704165f687149b4956fbd45c (diff)
downloadmaster-31e0f0ae-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.gz
master-31e0f0ae-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.bz2
master-31e0f0ae-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.zip
kernel: update 4.1 to 4.1.13
- two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47694
Diffstat (limited to 'target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch')
-rw-r--r--target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch b/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch
index e050ae763a..e3ffb330f5 100644
--- a/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch
+++ b/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch
@@ -12,8 +12,6 @@ Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
drivers/thermal/thermal_core.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
-diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
-index e204deb..19da022 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -450,9 +450,12 @@ exit:
@@ -31,7 +29,7 @@ index e204deb..19da022 100644
ret = thermal_zone_get_temp(tz, &temp);
if (ret) {
-@@ -471,16 +474,6 @@ static void update_temperature(struct thermal_zone_device *tz)
+@@ -471,16 +474,6 @@ static void update_temperature(struct th
trace_thermal_temperature(tz);
dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n",
tz->last_temperature, tz->temperature);
@@ -48,6 +46,3 @@ index e204deb..19da022 100644
for (count = 0; count < tz->trips; count++)
handle_thermal_trip(tz, count);
---
-1.7.10.4
-