[MIPS] IP22, IP28: Fix merge bug

[linux-2.6] / arch / sparc / prom / init.c

diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c
index b83409c81916126480999b8352641755df940080..729f87066945c2d7ddb713700650dd9c90062c0a 100644 (file)
--- a/arch/sparc/prom/init.c
+++ b/arch/sparc/prom/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $
+/*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
  *
@@ -6,7 +6,6 @@
  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 
@@ -22,8 +21,6 @@ linux_sun4_romvec *sun4_romvec;
 /* The root node of the prom device tree. */
 int prom_root_node;
 
-int prom_stdin, prom_stdout;
-
 /* Pointer to the device tree operations structure. */
 struct linux_nodeops *prom_nodeops;
 
@@ -75,11 +72,6 @@ void __init prom_init(struct linux_romvec *rp)
           (((unsigned long) prom_nodeops) == -1))
                prom_halt();
 
-       if(prom_vers == PROM_V2 || prom_vers == PROM_V3) {
-               prom_stdout = *romvec->pv_v2bootargs.fd_stdout;
-               prom_stdin  = *romvec->pv_v2bootargs.fd_stdin;
-       }
-       
        prom_meminit();
 
        prom_ranges_init();