From b6ea76183373cc6e1aa8465f4451986deb2c3191 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 1 May 2008 22:33:04 -0700
Subject: [PATCH] --- yaml --- r: 95863 b: refs/heads/master c:
 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c h: refs/heads/master i:   95861:
 d5d9305e5fcd9421f10abdd87393a4754b267369   95859:
 3d91ec36179f92c40c04f909135fcaec71e52741   95855:
 0d493b5387d6b1d5a81b25adc7a569f600b0a99c v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc/prom/init.c    | 7 -------
 trunk/include/asm-sparc/oplib.h | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index aaddd9f1cfcf..8f337601ecd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8
+refs/heads/master: 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c
diff --git a/trunk/arch/sparc/prom/init.c b/trunk/arch/sparc/prom/init.c
index 50abfb1b880e..2fa3a474e3a2 100644
--- a/trunk/arch/sparc/prom/init.c
+++ b/trunk/arch/sparc/prom/init.c
@@ -21,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;
 
@@ -74,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();
diff --git a/trunk/include/asm-sparc/oplib.h b/trunk/include/asm-sparc/oplib.h
index 22dc39d97b4e..7becc846544a 100644
--- a/trunk/include/asm-sparc/oplib.h
+++ b/trunk/include/asm-sparc/oplib.h
@@ -34,9 +34,6 @@ extern unsigned int prom_rev, prom_prev;
  */
 extern int prom_root_node;
 
-/* PROM stdin and stdout */
-extern int prom_stdin, prom_stdout;
-
 /* Pointer to prom structure containing the device tree traversal
  * and usage utility functions.  Only prom-lib should use these,
  * users use the interface defined by the library only!