aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/powermac/udbg_adb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index e51de55b2d6..d1c40e27e37 100644
--- a/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext)
171 udbg_adb_old_getc_poll = udbg_getc_poll; 171 udbg_adb_old_getc_poll = udbg_getc_poll;
172 172
173 /* Check if our early init was already called */ 173 /* Check if our early init was already called */
174 if (udbg_adb_old_putc == udbg_adb_putc || 174 if (udbg_adb_old_putc == udbg_adb_putc)
175 udbg_adb_old_putc == btext_drawchar)
176 udbg_adb_old_putc = NULL; 175 udbg_adb_old_putc = NULL;
176#ifdef CONFIG_BOOTX_TEXT
177 if (udbg_adb_old_putc == btext_drawchar)
178 udbg_adb_old_putc = NULL;
179#endif
177 180
178 /* Set ours as output */ 181 /* Set ours as output */
179 udbg_putc = udbg_adb_putc; 182 udbg_putc = udbg_adb_putc;