From d84e4c516010c2f4efa4cf6e50dbee2a44cc4f18 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@gate.crashing.org>
Date: Tue, 20 Dec 2005 16:37:07 -0600
Subject: [PATCH] --- yaml --- r: 17217 b: refs/heads/master c:
 be6b843918394067e93ebbacb834245251a6f18a h: refs/heads/master i:   17215:
 60bd883e31ee5d59e2f6d73b383d2dea565657e7 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/powerpc/kernel/udbg.c              | 6 ++++++
 trunk/arch/powerpc/platforms/powermac/setup.c | 8 +-------
 trunk/include/asm-powerpc/udbg.h              | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index bf6606e33e47..5dd781ae8ab6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b580d46ce833f6bdc6a5602f4f0efb1d9c488ed6
+refs/heads/master: be6b843918394067e93ebbacb834245251a6f18a
diff --git a/trunk/arch/powerpc/kernel/udbg.c b/trunk/arch/powerpc/kernel/udbg.c
index 9567d9474c80..558c1ceb2b93 100644
--- a/trunk/arch/powerpc/kernel/udbg.c
+++ b/trunk/arch/powerpc/kernel/udbg.c
@@ -90,6 +90,12 @@ void udbg_printf(const char *fmt, ...)
 	va_end(args);
 }
 
+void __init udbg_progress(char *s, unsigned short hex)
+{
+	udbg_puts(s);
+	udbg_puts("\n");
+}
+
 /*
  * Early boot console based on udbg
  */
diff --git a/trunk/arch/powerpc/platforms/powermac/setup.c b/trunk/arch/powerpc/platforms/powermac/setup.c
index 1daa5a06e9ea..e5a5bdbdda7a 100644
--- a/trunk/arch/powerpc/platforms/powermac/setup.c
+++ b/trunk/arch/powerpc/platforms/powermac/setup.c
@@ -639,12 +639,6 @@ static void __init pmac_init_early(void)
 #endif
 }
 
-static void __init pmac_progress(char *s, unsigned short hex)
-{
-	udbg_puts(s);
-	udbg_puts("\n");
-}
-
 /*
  * pmac has no legacy IO, anything calling this function has to
  * fail or bad things will happen
@@ -763,7 +757,7 @@ struct machdep_calls __initdata pmac_md = {
 	.calibrate_decr		= pmac_calibrate_decr,
 	.feature_call		= pmac_do_feature_call,
 	.check_legacy_ioport	= pmac_check_legacy_ioport,
-	.progress		= pmac_progress,
+	.progress		= udbg_progress,
 #ifdef CONFIG_PPC64
 	.pci_probe_mode		= pmac_pci_probe_mode,
 	.idle_loop		= native_idle,
diff --git a/trunk/include/asm-powerpc/udbg.h b/trunk/include/asm-powerpc/udbg.h
index 6c8abc924b28..479f2d8ff74a 100644
--- a/trunk/include/asm-powerpc/udbg.h
+++ b/trunk/include/asm-powerpc/udbg.h
@@ -24,6 +24,7 @@ extern int udbg_read(char *buf, int buflen);
 
 extern void register_early_udbg_console(void);
 extern void udbg_printf(const char *fmt, ...);
+extern void udbg_progress(char *s, unsigned short hex);
 
 extern void udbg_init_uart(void __iomem *comport, unsigned int speed,
 			   unsigned int clock);