From 287fae2ea0343c34cd87146ba4895924d5c4858c Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 2 Apr 2012 13:54:38 +0200
Subject: [PATCH] --- yaml --- r: 304167 b: refs/heads/master c:
 107afb7a50726cb8ea9ed74d62311ddc59fef1da h: refs/heads/master i:   304165:
 d7545fdb2f60e5f61c063f9b564f630872756ed1   304163:
 886ac8d491076b6142834a0a585a941c3fc43b55   304159:
 dcbcfb06b0a93443807e10657844c27304baec82 v: v3

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

diff --git a/[refs] b/[refs]
index 6ab9eb0a9588..698a8ed96516 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8aa50f2da25824d378a409bd75325653c997200
+refs/heads/master: 107afb7a50726cb8ea9ed74d62311ddc59fef1da
diff --git a/trunk/drivers/tty/serial/68328serial.c b/trunk/drivers/tty/serial/68328serial.c
index 81ed91ed7386..f0d5039a7b34 100644
--- a/trunk/drivers/tty/serial/68328serial.c
+++ b/trunk/drivers/tty/serial/68328serial.c
@@ -162,7 +162,8 @@ static void rs_stop(struct tty_struct *tty)
 
 static int rs_put_char(char ch)
 {
-        int flags, loops = 0;
+	unsigned long flags;
+	int loops = 0;
 
         local_irq_save(flags);
 
@@ -1182,7 +1183,8 @@ static const struct tty_operations rs_ops = {
 static int __init
 rs68328_init(void)
 {
-	int flags, i;
+	unsigned long flags;
+	int i;
 	struct m68k_serial *info;
 
 	serial_driver = alloc_tty_driver(NR_PORTS);