From 3ec717457c5554fc02315bec55a8a5121818fb3b Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Wed, 8 Feb 2006 09:19:17 +1000
Subject: [PATCH] --- yaml --- r: 19997 b: refs/heads/master c:
 a9cdffb14ae8a95335ba4e9add1f1086c4d65372 h: refs/heads/master i:   19995:
 acaefc6c184096c8d550cbe593b9af68979f6bd7 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/serial/mcfserial.c | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 13dc096cff87..ac583fbc3add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2da436e00f9a5fdd0fb6b31e4b2b2ba82e8f5ab8
+refs/heads/master: a9cdffb14ae8a95335ba4e9add1f1086c4d65372
diff --git a/trunk/drivers/serial/mcfserial.c b/trunk/drivers/serial/mcfserial.c
index 0ef648fa4b2d..8cbbb954df2c 100644
--- a/trunk/drivers/serial/mcfserial.c
+++ b/trunk/drivers/serial/mcfserial.c
@@ -57,20 +57,16 @@ struct timer_list mcfrs_timer_struct;
  *	keep going.  Perhaps one day the cflag settings for the
  *	console can be used instead.
  */
-#if defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
-    defined(CONFIG_senTec) || defined(CONFIG_SNEHA)
-#define	CONSOLE_BAUD_RATE	19200
-#define	DEFAULT_CBAUD		B19200
-#endif
-
 #if defined(CONFIG_HW_FEITH)
 #define	CONSOLE_BAUD_RATE	38400
 #define	DEFAULT_CBAUD		B38400
-#endif
-
-#if defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)
+#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)
 #define CONSOLE_BAUD_RATE 	115200
 #define DEFAULT_CBAUD		B115200
+#elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
+      defined(CONFIG_senTec) || defined(CONFIG_SNEHA)
+#define	CONSOLE_BAUD_RATE	19200
+#define	DEFAULT_CBAUD		B19200
 #endif
 
 #ifndef CONSOLE_BAUD_RATE
@@ -350,7 +346,7 @@ static inline void receive_chars(struct mcf_serial *info)
 		}
 		tty_insert_flip_char(tty, ch, flag);
 	}
-	tty_flip_buffer_push(tty);
+	tty_schedule_flip(tty);
 	return;
 }