From 71e89c9214d59ddceb717dd5bf05753b0ef7b6b8 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed, 27 Oct 2010 04:16:49 -0400
Subject: [PATCH] --- yaml --- r: 221910 b: refs/heads/master c:
 6d9e44986891345636e2d6069c4ae1612b2337d4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/bfin_5xx.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b18fe689b643..5996afccaa98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 001a05d56edd9d82b27e69951fb9520f9ce6ed72
+refs/heads/master: 6d9e44986891345636e2d6069c4ae1612b2337d4
diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c
index a454e427c949..965532157c65 100644
--- a/trunk/drivers/serial/bfin_5xx.c
+++ b/trunk/drivers/serial/bfin_5xx.c
@@ -1324,6 +1324,14 @@ struct console __init *bfin_earlyserial_init(unsigned int port,
 	struct bfin_serial_port *uart;
 	struct ktermios t;
 
+#ifdef CONFIG_SERIAL_BFIN_CONSOLE
+	/*
+	 * If we are using early serial, don't let the normal console rewind
+	 * log buffer, since that causes things to be printed multiple times
+	 */
+	bfin_serial_console.flags &= ~CON_PRINTBUFFER;
+#endif
+
 	if (port == -1 || port >= nr_active_ports)
 		port = 0;
 	bfin_serial_init_ports();