[9610] thermal: Fix conflict exynos tmu code

Change-Id: I92a26bbd793e879ee74f700d718083b915ec3b96
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 3652004813e5854799762c0a67148f6d2201ef00..4c3624e4fb3efbf9fbba414019412da62c71ccaf 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -488,16 +488,9 @@ static int exynos9610_tmu_initialize(struct platform_device *pdev)
                if (!data->sensor_info[count].temp_error1)
                        data->sensor_info[count].temp_error1 = pdata->efuse_value & EXYNOS_TMU_TEMP_MASK;
 
-<<<<<<< HEAD
                /* Check temp_error2 if calibration type is TYPE_TWO_POINT_TRIMMING */
                if (data->sensor_info[count].cal_type == TYPE_TWO_POINT_TRIMMING) {
                        data->sensor_info[count].temp_error2 = temp_error2;
-=======
-               rising_threshold = readl(data->base + rising_reg_offset);
-               rising_threshold &= ~(0xff << j * 8);
-               rising_threshold |= (threshold_code << j * 8);
-               writel(rising_threshold, data->base + rising_reg_offset);
->>>>>>> android-4.14-p
 
                        if (!data->sensor_info[count].temp_error2)
                                data->sensor_info[count].temp_error2 =