patch-2.3.24 linux/drivers/macintosh/macserial.c

• Lines: 20
• Date: Wed Oct 27 15:33:36 1999
• Orig file: v2.3.23/linux/drivers/macintosh/macserial.c
• Orig date: Fri Oct 22 13:21:49 1999

diff -u --recursive --new-file v2.3.23/linux/drivers/macintosh/macserial.c linux/drivers/macintosh/macserial.c
@@ -2584,7 +2584,9 @@
  * ------------------------------------------------------------
  */
 #ifdef CONFIG_SERIAL_CONSOLE
-
+#ifdef CONFIG_SERIAL
+#error Cannot build serial console with macserial and serial drivers
+#endif
 
 /*
  *	Print a string to the serial port trying not to disturb
@@ -2843,7 +2845,7 @@
 /*
  *	Register console.
  */
-long __init serial_console_init(long kmem_start, long kmem_end)
+void __init serial_console_init(void)
 {
 	register_console(&sercons);
 	return kmem_start;