---

yaml --- r: 17152 b: refs/heads/master c: 52020d2 h: refs/heads/master v: v3
git-mirror · Jan 9, 2006 · cdf7f5a · cdf7f5a
1 parent d245559
commit cdf7f5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf6a8fa21570f37fd1789610da30f70a05ac5e3
+refs/heads/master: 52020d2bda9fe447bb50674a2e39e4064b6a10b5
diff --git a/trunk/arch/powerpc/platforms/powermac/udbg_adb.c b/trunk/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext)
 	udbg_adb_old_getc_poll = udbg_getc_poll;
 
 	/* Check if our early init was already called */
-	if (udbg_adb_old_putc == udbg_adb_putc ||
-	    udbg_adb_old_putc == btext_drawchar)
+	if (udbg_adb_old_putc == udbg_adb_putc)
 		udbg_adb_old_putc = NULL;
+#ifdef CONFIG_BOOTX_TEXT
+	if (udbg_adb_old_putc == btext_drawchar)
+		udbg_adb_old_putc = NULL;
+#endif
 
 	/* Set ours as output */
 	udbg_putc = udbg_adb_putc;