Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / prom_32.c

diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 5ad2012ae104ae52648f2d440b5c18885e52d6ff..fe43e80772dbf597e201b7badd87521b364c6e53 100644 (file)
--- 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)
@@ -298,3 +289,7 @@ void __init of_console_init(void)
 void __init of_fill_in_cpu_data(void)
 {
 }
+
+void __init irq_trans_init(struct device_node *dp)
+{
+}