aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/kernel/early_printk.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 85ed5b7ef278..2f30977558ad 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 1999, 2000 Niibe Yutaka 4 * Copyright (C) 1999, 2000 Niibe Yutaka
5 * Copyright (C) 2002 M. R. Brown 5 * Copyright (C) 2002 M. R. Brown
6 * Copyright (C) 2004 - 2006 Paul Mundt 6 * Copyright (C) 2004 - 2007 Paul Mundt
7 * 7 *
8 * This file is subject to the terms and conditions of the GNU General Public 8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file "COPYING" in the main directory of this archive 9 * License. See the file "COPYING" in the main directory of this archive
@@ -73,8 +73,6 @@ static struct console bios_console = {
73#define EPK_FIFO_BITS (0x1f00 >> 8) 73#define EPK_FIFO_BITS (0x1f00 >> 8)
74#endif 74#endif
75 75
76
77
78static struct uart_port scif_port = { 76static struct uart_port scif_port = {
79 .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT, 77 .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT,
80 .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT, 78 .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
@@ -192,17 +190,12 @@ static struct console *early_console =
192#endif 190#endif
193 ; 191 ;
194 192
195static int __initdata keep_early; 193static int __init setup_early_printk(char *buf)
196static int early_console_initialized;
197
198int __init setup_early_printk(char *buf)
199{ 194{
200 if (!buf) 195 int keep_early = 0;
201 return 0;
202 196
203 if (early_console_initialized) 197 if (!buf)
204 return 0; 198 return 0;
205 early_console_initialized = 1;
206 199
207 if (strstr(buf, "keep")) 200 if (strstr(buf, "keep"))
208 keep_early = 1; 201 keep_early = 1;