From f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 2 Dec 2015 21:52:41 +0000 Subject: 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 Signed-off-by: Hauke Mehrtens SVN-Revision: 47694 --- .../patches/0015-thermal-inline-only-once-used-function.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch') 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 e050ae7..e3ffb33 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 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 - -- cgit v1.1