From 74f26178613826a0566152012969e2934110b5c8 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 28 Sep 2010 16:40:00 +1000 Subject: [PATCH] --- yaml --- r: 217147 b: refs/heads/master c: 51f5fa50942ab013aa2e321bdfdba1c34ebf3256 h: refs/heads/master i: 217145: a0e865ef6431d92d6b2a54397b845c7fedb12add 217143: 69453206e4563183f757f403f2bd2d0a1dcf437b v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/early_printk.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c814a0ba5460..0718efac4cde 100644 --- 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 index 41e285c354b6..685a64e93ede 100644 --- 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)