patch-2.3.99-pre9 linux/arch/mips/dec/serial.c

Next file: linux/arch/mips/defconfig
Previous file: linux/arch/mips/dec/rtc-dec.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips/dec/serial.c linux/arch/mips/dec/serial.c
@@ -31,11 +31,11 @@
 #ifdef CONFIG_SERIAL_CONSOLE
 
 #ifdef CONFIG_ZS
-extern long zs_serial_console_init(long, long);
+extern void zs_serial_console_init(void);
 #endif
 
 #ifdef CONFIG_DZ
-extern long dz_serial_console_init(long, long);
+extern void dz_serial_console_init(void);
 #endif
 
 #endif
@@ -66,6 +66,8 @@
 #endif
 }
 
+__initcall(rs_init);
+
 #endif
 
 #ifdef CONFIG_SERIAL_CONSOLE
@@ -73,26 +75,24 @@
 /* serial_console_init handles the special case of starting
  *   up the console on the serial port
  */
-long __init serial_console_init(long kmem_start, long kmem_end)
+void __init serial_console_init(void)
 {
 #if defined(CONFIG_ZS) && defined(CONFIG_DZ)
     if (IOASIC)
-	kmem_start = zs_serial_console_init(kmem_start, kmem_end);
+	zs_serial_console_init();
     else
-	kmem_start = dz_serial_console_init(kmem_start, kmem_end);
+	dz_serial_console_init();
 #else
 
 #ifdef CONFIG_ZS
-    kmem_start = zs_serial_console_init(kmem_start, kmem_end);
+    zs_serial_console_init();
 #endif
 
 #ifdef CONFIG_DZ
-    kmem_start = dz_serial_console_init(kmem_start, kmem_end);
+    dz_serial_console_init();
 #endif
 
 #endif
-
-    return kmem_start;
 }
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)