From 9b54eb19f45de87b8080457e237cf0aca136bd7c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Mon, 6 Apr 2009 17:32:28 +0100
Subject: [PATCH] --- yaml --- r: 142267 b: refs/heads/master c:
 59e4e3e65d3f856cfcdc66de2db5530d7b161f68 h: refs/heads/master i:   142265:
 c4633152b7251745ebd80fa9790381668248f7ef   142263:
 9161c10f8eb302cec49081d33e4930d405d8f5b9 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/bfin_5xx.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3fa6e5939bbe..26478c1bb73e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f933d3c740b32bdd284c74b2e40e838b585ecf0f
+refs/heads/master: 59e4e3e65d3f856cfcdc66de2db5530d7b161f68
diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c
index 318d69dce8e1..45c32b23d736 100644
--- a/trunk/drivers/serial/bfin_5xx.c
+++ b/trunk/drivers/serial/bfin_5xx.c
@@ -415,7 +415,8 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 
 void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
 {
-	int x_pos, pos, flags;
+	int x_pos, pos;
+	unsigned long flags;
 
 	spin_lock_irqsave(&uart->port.lock, flags);
 
@@ -1088,7 +1089,7 @@ static void
 bfin_serial_console_write(struct console *co, const char *s, unsigned int count)
 {
 	struct bfin_serial_port *uart = &bfin_serial_ports[co->index];
-	int flags = 0;
+	unsigned long flags;
 
 	spin_lock_irqsave(&uart->port.lock, flags);
 	uart_console_write(&uart->port, s, count, bfin_serial_console_putchar);