tty: serial: samsung: fix conflict during updating 4.14.113

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

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index cddc1b98d2aeb22dbbad3dda33066863c33c4a65..7a4cbe16659fd07abd46e87612b427e4f922e425 100644 (file)
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1074,12 +1074,9 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
        wr_regl(port, S3C2410_ULCON, ulcon);
        wr_regl(port, S3C2410_UBRDIV, quot);
 
-<<<<<<< HEAD
        if (ourport->info->has_divslot)
                wr_regl(port, S3C2443_DIVSLOT, udivslot);
-=======
        port->status &= ~UPSTAT_AUTOCTS;
->>>>>>> android-4.14-p
 
        umcon = rd_regl(port, S3C2410_UMCON);
        if (termios->c_cflag & CRTSCTS) {