---

yaml --- r: 304167 b: refs/heads/master c: 107afb7 h: refs/heads/master i: 304165: d7545fd 304163: 886ac8d 304159: dcbcfb0 v: v3
git-mirror · Apr 9, 2012 · 287fae2 · 287fae2
1 parent 7171242
commit 287fae2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);