sparc64: Use generic BQ4802 RTC driver.

[safe/jmp/linux-2.6] / arch / sparc64 / kernel / setup.c

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 577c823..c8b03a4 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)
@@ -51,6 +51,8 @@
 #include <net/ipconfig.h>
 #endif
 
+#include "entry.h"
+
 /* Used to synchronize accesses to NatSemi SUPER I/O chip configure
  * operations in asm/ns87303.h
  */
@@ -68,8 +70,6 @@ struct screen_info screen_info = {
        16                      /* orig-video-points */
 };
 
-void (*prom_palette)(int);
-
 static void
 prom_console_write(struct console *con, const char *s, unsigned n)
 {
@@ -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);
@@ -337,9 +338,6 @@ void __init setup_arch(char **cmdline_p)
 
 /* BUFFER is PAGE_SIZE bytes long. */
 
-extern char *sparc_cpu_type;
-extern char *sparc_fpu_type;
-
 extern void smp_info(struct seq_file *);
 extern void smp_bogo(struct seq_file *);
 extern void mmu_info(struct seq_file *);