---

yaml --- r: 217147 b: refs/heads/master c: 51f5fa5 h: refs/heads/master i: 217145: a0e865e 217143: 6945320 v: v3
git-mirror · Oct 21, 2010 · 74f2617 · 74f2617
1 parent 7df527e
commit 74f2617
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a7e8d805ea042a7f37c8d3cef8350db63df9d57
+refs/heads/master: 51f5fa50942ab013aa2e321bdfdba1c34ebf3256
diff --git a/trunk/arch/microblaze/kernel/early_printk.c b/trunk/arch/microblaze/kernel/early_printk.c
@@ -24,6 +24,7 @@
 static u32 early_console_initialized;
 static u32 base_addr;
 
+#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 static void early_printk_uartlite_putc(char c)
 {
 	/*
@@ -62,6 +63,7 @@ static struct console early_serial_uartlite_console = {
 	.flags = CON_PRINTBUFFER,
 	.index = -1,
 };
+#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
 
 static struct console *early_console;
 
@@ -84,6 +86,7 @@ int __init setup_early_printk(char *opt)
 	if (early_console_initialized)
 		return 1;
 
+#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 	base_addr = early_uartlite_console();
 	if (base_addr) {
 		early_console_initialized = 1;
@@ -97,8 +100,10 @@ int __init setup_early_printk(char *opt)
 		/* register_console(early_console); */
 
 		return 0;
-	} else
-		return 1;
+	}
+#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
+
+	return 1;
 }
 
 void __init disable_early_printk(void)