Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68296
b: refs/heads/master
c: 008d50f
h: refs/heads/master
v: v3
  • Loading branch information
Paul Mundt committed Oct 2, 2007
1 parent a99fd01 commit d577838
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 78d7e0e5b8e5d662c3e4bdceadbd84c913e69614
refs/heads/master: 008d50fc16e8ea5005d324a25d62d29e417151fe
15 changes: 4 additions & 11 deletions trunk/arch/sh/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (C) 1999, 2000 Niibe Yutaka
* Copyright (C) 2002 M. R. Brown
* Copyright (C) 2004 - 2006 Paul Mundt
* Copyright (C) 2004 - 2007 Paul Mundt
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
Expand Down Expand Up @@ -73,8 +73,6 @@ static struct console bios_console = {
#define EPK_FIFO_BITS (0x1f00 >> 8)
#endif



static struct uart_port scif_port = {
.mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT,
.membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
Expand Down Expand Up @@ -192,17 +190,12 @@ static struct console *early_console =
#endif
;

static int __initdata keep_early;
static int early_console_initialized;

int __init setup_early_printk(char *buf)
static int __init setup_early_printk(char *buf)
{
if (!buf)
return 0;
int keep_early = 0;

if (early_console_initialized)
if (!buf)
return 0;
early_console_initialized = 1;

if (strstr(buf, "keep"))
keep_early = 1;
Expand Down

0 comments on commit d577838

Please sign in to comment.