[PATCH] ppc64: Consolidate early console and PPCDBG code

Consolidate the early console and PPCDBG code in udbg.c

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/include/asm-ppc64/udbg.h b/include/asm-ppc64/udbg.h
index 2cf1e87..c786604 100644
--- a/include/asm-ppc64/udbg.h
+++ b/include/asm-ppc64/udbg.h
@@ -2,6 +2,7 @@
 #define __UDBG_HDR
 
 #include <linux/compiler.h>
+#include <linux/init.h>
 
 /*
  * c 2001 PPC 64 Team, IBM Corp
@@ -20,12 +21,11 @@
 extern int udbg_write(const char *s, int n);
 extern int udbg_read(char *buf, int buflen);
 
-struct console;
-extern void udbg_console_write(struct console *con, const char *s, unsigned int n);
+extern void register_early_udbg_console(void);
 extern void udbg_printf(const char *fmt, ...);
 extern void udbg_ppcdbg(unsigned long flags, const char *fmt, ...);
 extern unsigned long udbg_ifdebug(unsigned long flags);
-
+extern void __init ppcdbg_initialize(void);
 
 extern void udbg_init_uart(void __iomem *comport, unsigned int speed);
 #endif