From f454161f09693733a98069109ac62fe98327ff38 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 5 Dec 2008 15:20:26 -0800
Subject: [PATCH] --- yaml --- r: 123377 b: refs/heads/master c:
 ad07aed8ca2023bcfe224a5e3e55bafec2c741d0 h: refs/heads/master i:   123375:
 d94bfadc26547ea2c03a01ee54ea4d60e263711f v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc/kernel/prom_32.c     | 9 ---------
 trunk/arch/sparc/kernel/prom_64.c     | 9 ---------
 trunk/arch/sparc/kernel/prom_common.c | 9 +++++++++
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 6df1c5ac8f57..1eefaf592adf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23dc758e47aeb3cc2414c2ec69b7b3e95f447071
+refs/heads/master: ad07aed8ca2023bcfe224a5e3e55bafec2c741d0
diff --git a/trunk/arch/sparc/kernel/prom_32.c b/trunk/arch/sparc/kernel/prom_32.c
index 5ad2012ae104..f21e8fc9a8fb 100644
--- a/trunk/arch/sparc/kernel/prom_32.c
+++ b/trunk/arch/sparc/kernel/prom_32.c
@@ -166,15 +166,6 @@ char * __init build_path_component(struct device_node *dp)
 	return n;
 }
 
-struct device_node *of_console_device;
-EXPORT_SYMBOL(of_console_device);
-
-char *of_console_path;
-EXPORT_SYMBOL(of_console_path);
-
-char *of_console_options;
-EXPORT_SYMBOL(of_console_options);
-
 extern void restore_current(void);
 
 void __init of_console_init(void)
diff --git a/trunk/arch/sparc/kernel/prom_64.c b/trunk/arch/sparc/kernel/prom_64.c
index 3afb838a6e61..edecca7b8116 100644
--- a/trunk/arch/sparc/kernel/prom_64.c
+++ b/trunk/arch/sparc/kernel/prom_64.c
@@ -526,15 +526,6 @@ void __init of_fill_in_cpu_data(void)
 	smp_fill_in_sib_core_maps();
 }
 
-struct device_node *of_console_device;
-EXPORT_SYMBOL(of_console_device);
-
-char *of_console_path;
-EXPORT_SYMBOL(of_console_path);
-
-char *of_console_options;
-EXPORT_SYMBOL(of_console_options);
-
 void __init of_console_init(void)
 {
 	char *msg = "OF stdout device is: %s\n";
diff --git a/trunk/arch/sparc/kernel/prom_common.c b/trunk/arch/sparc/kernel/prom_common.c
index 95e8e5d1b0fb..2736f3d74c7f 100644
--- a/trunk/arch/sparc/kernel/prom_common.c
+++ b/trunk/arch/sparc/kernel/prom_common.c
@@ -25,6 +25,15 @@
 
 #include "prom.h"
 
+struct device_node *of_console_device;
+EXPORT_SYMBOL(of_console_device);
+
+char *of_console_path;
+EXPORT_SYMBOL(of_console_path);
+
+char *of_console_options;
+EXPORT_SYMBOL(of_console_options);
+
 struct device_node *of_find_node_by_phandle(phandle handle)
 {
 	struct device_node *np;