summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-06 00:20:26 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-06 03:17:08 +0100
commitad07aed8ca2023bcfe224a5e3e55bafec2c741d0 (patch)
tree20e01987cba8043df612d372758e74981424715d
parentsparc: Move prom_build_devicetree() into prom_common.c (diff)
downloadlinux-ad07aed8ca2023bcfe224a5e3e55bafec2c741d0.tar.xz
linux-ad07aed8ca2023bcfe224a5e3e55bafec2c741d0.zip
sparc: Move of_console_{device,path,options} info prom_common.c
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/kernel/prom_32.c9
-rw-r--r--arch/sparc/kernel/prom_64.c9
-rw-r--r--arch/sparc/kernel/prom_common.c9
3 files changed, 9 insertions, 18 deletions
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 5ad2012ae104..f21e8fc9a8fb 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/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/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 3afb838a6e61..edecca7b8116 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/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/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 95e8e5d1b0fb..2736f3d74c7f 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/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;