From 664108b5ebdc012d52c1f5adf08764536a4cd103 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Fri, 3 Apr 2009 16:15:49 -0500
Subject: [PATCH] --- yaml --- r: 142513 b: refs/heads/master c:
 4d8107f474029167ae69862bf6b2c7273be757c7 h: refs/heads/master i:   142511:
 30ead2c24e59db25f28988b0d6a7015550aeaa45 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 28ef2f63ab2b..d96a6c907c71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd86ef378412fc30282daf722a833f734e4e2236
+refs/heads/master: 4d8107f474029167ae69862bf6b2c7273be757c7
diff --git a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
index 4dd00bea191a..f8df0681e160 100644
--- a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1106,6 +1106,10 @@ static int cpm_uart_init_port(struct device_node *np,
 	for (i = 0; i < NUM_GPIOS; i++)
 		pinfo->gpios[i] = of_get_gpio(np, i);
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+	udbg_putc = NULL;
+#endif
+
 	return cpm_uart_request_port(&pinfo->port);
 
 out_pram:
@@ -1255,10 +1259,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
 			baud = 9600;
 	}
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
-	udbg_putc = NULL;
-#endif
-
 	if (IS_SMC(pinfo)) {
 		out_be16(&pinfo->smcup->smc_brkcr, 0);
 		cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX);