The rs_init changes are causing occaisional problems

on my SBUS dual-Ultra so revert this
for now.

4 files changed, 12 insertions, 8 deletions

diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index a0ee1d3b3..f2f1096b7 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -1,4 +1,4 @@
-/* $Id: ebus.c,v 1.19 2001-12-18 20:41:06 davem Exp $
+/* $Id: ebus.c,v 1.20 2002-01-05 01:13:43 davem Exp $
  * ebus.c: PCI to EBus bridge device.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -27,6 +27,7 @@ struct linux_ebus *ebus_chain = 0;
 #ifdef CONFIG_SUN_AUXIO
 extern void auxio_probe(void);
 #endif
+extern void rs_init(void);
 
 /* We are together with pcic.c under CONFIG_PCI. */
 extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
@@ -364,6 +365,7 @@ void __init ebus_init(void)
 		++num_ebus;
 	}
 
+	rs_init();
 #ifdef CONFIG_SUN_AUXIO
 	auxio_probe();
 #endif
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 6938e1fe4..8c1acb11c 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -1,4 +1,4 @@
-/* $Id: pci.c,v 1.38 2001-12-21 04:56:15 davem Exp $
+/* $Id: pci.c,v 1.39 2002-01-05 01:13:43 davem Exp $
  * pci.c: UltraSparc PCI controller support.
  *
  * Copyright (C) 1997, 1998, 1999 David S. Miller (davem@redhat.com)
@@ -177,6 +177,7 @@ static void __init pci_reorder_devs(void)
 	}
 }
 
+extern void rs_init(void);
 extern void clock_probe(void);
 extern void power_init(void);
 
@@ -193,6 +194,7 @@ void __init pcibios_init(void)
 
 	isa_init();
 	ebus_init();
+	rs_init();
 	clock_probe();
 	power_init();
 }
diff --git a/drivers/sbus/char/sunserial.c b/drivers/sbus/char/sunserial.c
index 5e9f6c0b4..aa6194878 100644
--- a/drivers/sbus/char/sunserial.c
+++ b/drivers/sbus/char/sunserial.c
@@ -1,4 +1,4 @@
-/* $Id: sunserial.c,v 1.80 2001-12-18 20:41:06 davem Exp $
+/* $Id: sunserial.c,v 1.81 2002-01-05 01:13:43 davem Exp $
  * serial.c: Serial port driver infrastructure for the Sparc.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -54,7 +54,7 @@ struct sunserial_operations rs_ops = {
 	nop_rs_read_proc
 };
 
-static int __init rs_init(void)
+void rs_init(void)
 {
 	static int invoked = 0;
 
@@ -69,7 +69,6 @@ static int __init rs_init(void)
 			init = init->next;
 		}
 	}
-	return 0;
 }
 
 void __init rs_kgdb_hook(int channel)
@@ -456,5 +455,3 @@ void __init sun_serial_setup(void)
 	prom_printf("No serial devices found, bailing out.\n");
 	prom_halt();
 }
-
-module_init(rs_init);
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index 43b2d9c42..561d07b73 100644
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -1,4 +1,4 @@
-/* $Id: sbus.c,v 1.97 2001-12-19 00:29:51 davem Exp $
+/* $Id: sbus.c,v 1.98 2002-01-05 01:13:43 davem Exp $
  * sbus.c:  SBus support routines.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -282,6 +282,7 @@ 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);
 
 void __init sbus_init(void)
 {
@@ -489,6 +490,8 @@ void __init sbus_init(void)
 		sun4d_init_sbi_irq();
 	}
 	
+	rs_init();
+
 #ifdef __sparc_v9__
 	if (sparc_cpu_model == sun4u) {
 		firetruck_init();