From 2414d3078305cc329d230b62e4da16e42e3fb4e0 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Mon, 21 Nov 2011 15:43:28 +0530
Subject: [PATCH] --- yaml --- r: 280682 b: refs/heads/master c:
 514f31d19ed6d001cac37af0b4a3f61b07969d59 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7195f3930e41..f11ab3ea065e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd7c7c3f69291baa488b8a50db683d5fbf44166a
+refs/heads/master: 514f31d19ed6d001cac37af0b4a3f61b07969d59
diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c
index 5e713d3ef1f4..f2a1380ed678 100644
--- a/trunk/drivers/tty/serial/omap-serial.c
+++ b/trunk/drivers/tty/serial/omap-serial.c
@@ -399,7 +399,7 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
 static unsigned int serial_omap_get_mctrl(struct uart_port *port)
 {
 	struct uart_omap_port *up = (struct uart_omap_port *)port;
-	unsigned char status;
+	unsigned int status;
 	unsigned int ret = 0;
 
 	status = check_modem_status(up);