Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / setup.c

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 6acb4c51cfe4944e3d8c8dae77417515e64514cc..c8b03a4f68bf8554a5f7e31b0c873474bac730f7 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -1,4 +1,4 @@
-/*  $Id: setup.c,v 1.72 2002/02/09 19:49:30 davem Exp $
+/*
  *  linux/arch/sparc64/kernel/setup.c
  *
  *  Copyright (C) 1995,1996  David S. Miller (davem@caip.rutgers.edu)
@@ -82,7 +82,7 @@ unsigned long cmdline_memory_size = 0;
 static struct console prom_early_console = {
        .name =         "earlyprom",
        .write =        prom_console_write,
-       .flags =        CON_PRINTBUFFER | CON_BOOT,
+       .flags =        CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
        .index =        -1,
 };
 
@@ -281,6 +281,7 @@ void __init setup_arch(char **cmdline_p)
        /* Initialize PROM console and command line. */
        *cmdline_p = prom_getbootargs();
        strcpy(boot_command_line, *cmdline_p);
+       parse_early_param();
 
        boot_flags_init(*cmdline_p);
        register_console(&prom_early_console);