From f5e8d447e54a4a60af3eed3bc16092fb8e1917f7 Mon Sep 17 00:00:00 2001
From: Thomas Abraham <thomas.abraham@linaro.org>
Date: Mon, 31 Dec 2012 13:42:45 -0800
Subject: [PATCH] --- yaml --- r: 348907 b: refs/heads/master c:
 2eaa865ffd66ca2e5a841e8c756d75f89e3482ae h: refs/heads/master i:   348905:
 6c20b4346af08b369d661580c8ef07674de41f1e   348903:
 3bb9a4fc3c18f6f3ab6f680c94c3b6e2f3d4e644 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/samsung.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3452fe5a6cc7..5e7172be042f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 014b9b4ce84281ccb3d723c792bed19815f3571a
+refs/heads/master: 2eaa865ffd66ca2e5a841e8c756d75f89e3482ae
diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c
index 12e5249d053e..e514b3a4dc57 100644
--- a/trunk/drivers/tty/serial/samsung.c
+++ b/trunk/drivers/tty/serial/samsung.c
@@ -1006,7 +1006,6 @@ static void s3c24xx_serial_resetport(struct uart_port *port,
 
 	ucon &= ucon_mask;
 	wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-	wr_regl(port, S3C2410_ULCON, cfg->ulcon);
 
 	/* reset both fifos */
 	wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);