SPARC64: Kill rs_init calls from sbus/pci init.

diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 9f37fe4cf2020a3f07927fb13a162792bd3ae2d7..a62117792d7c7898fb43da30c2ac2ba722aea005 100644 (file)
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -177,7 +177,6 @@ static void __init pci_reorder_devs(void)
        }
 }
 
-extern void rs_init(void);
 extern void clock_probe(void);
 extern void power_init(void);
 
@@ -194,7 +193,6 @@ static int __init pcibios_init(void)
 
        isa_init();
        ebus_init();
-       rs_init();
        clock_probe();
        power_init();
 

diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index 6a657c3a3d7162e89a6f693ba6a9bebc05575cc2..747978087a7ec6f3dc5ebbcca5e4770773016509 100644 (file)
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -285,7 +285,6 @@ static void __init sbus_fixup_all_regs(struct sbus_dev *first_sdev)
 
 extern void register_proc_sparc_ioport(void);
 extern void firetruck_init(void);
-extern void rs_init(void);
 
 static int __init sbus_init(void)
 {
@@ -505,8 +504,6 @@ static int __init sbus_init(void)
                sun4d_init_sbi_irq();
        }
        
-       rs_init();
-
 #ifdef __sparc_v9__
        if (sparc_cpu_model == sun4u) {
                firetruck_init();