From bd3cbb1efa9c096852e97b3ade3c3b625aac1cd7 Mon Sep 17 00:00:00 2001
From: Nye Liu <nyet@mrv.com>
Date: Fri, 27 Jun 2008 13:01:00 -0700
Subject: [PATCH] --- yaml --- r: 101787 b: refs/heads/master c:
 5e82eb333949e2f1652bf70d36dfaa875306ae11 h: refs/heads/master i:   101785:
 4aacd8fe48ab4ff9338b54c676355b27979a87f0   101783:
 67308c05ec5ae50567f0cd72c69ad8fa3db4d005 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/sysdev/cpm_common.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f1f0a90284a2..299415418259 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3083220c089c626a66b66af0eff4f9220d5b797
+refs/heads/master: 5e82eb333949e2f1652bf70d36dfaa875306ae11
diff --git a/trunk/arch/powerpc/sysdev/cpm_common.c b/trunk/arch/powerpc/sysdev/cpm_common.c
index 9b75d164bdf9..e4b7296acb2c 100644
--- a/trunk/arch/powerpc/sysdev/cpm_common.c
+++ b/trunk/arch/powerpc/sysdev/cpm_common.c
@@ -37,7 +37,7 @@ static void udbg_putc_cpm(char c)
 	u8 __iomem *txbuf = (u8 __iomem __force *)in_be32(&cpm_udbg_txdesc[1]);
 
 	if (c == '\n')
-		udbg_putc('\r');
+		udbg_putc_cpm('\r');
 
 	while (in_be32(&cpm_udbg_txdesc[0]) & 0x80000000)
 		;
@@ -53,7 +53,6 @@ void __init udbg_init_cpm(void)
 		setbat(1, 0xf0000000, 0xf0000000, 1024*1024, _PAGE_IO);
 #endif
 		udbg_putc = udbg_putc_cpm;
-		udbg_putc('X');
 	}
 }
 #endif