[COMMON] thermal: samsung: Resolve conflict
authorSoomin Kim <sm8326.kim@samsung.com>
Mon, 30 Jul 2018 10:30:32 +0000 (19:30 +0900)
committerSoomin Kim <sm8326.kim@samsung.com>
Tue, 31 Jul 2018 06:44:20 +0000 (15:44 +0900)
commit2d3b3890977cf0469371ddce3f678b853d300756
tree853f22f64e8070d54bd519f940fba695691d82e0
parent5e06d8a4564a07a9479913c8cc6f9d0f09c140de
[COMMON] thermal: samsung: Resolve conflict

TMU driver has faced with conflict during
kernel minor upgrade. This is caused by
'exynos_tmu.c' is maintained. So, redundant
code is removed.

Change-Id: I7c2b530668c89845599eaeba4537bd2c0ea60855
Signed-off-by: Soomin Kim <sm8326.kim@samsung.com>
drivers/thermal/samsung/exynos_tmu.c
drivers/thermal/samsung/exynos_tmu.h