summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/sunserial.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus/char/sunserial.c')
-rw-r--r--drivers/sbus/char/sunserial.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/drivers/sbus/char/sunserial.c b/drivers/sbus/char/sunserial.c
index 8fb203207..5a45c85ae 100644
--- a/drivers/sbus/char/sunserial.c
+++ b/drivers/sbus/char/sunserial.c
@@ -1,4 +1,4 @@
-/* $Id: sunserial.c,v 1.56 1997/12/19 07:33:07 ecd Exp $
+/* $Id: sunserial.c,v 1.61 1998/07/28 13:59:52 jj Exp $
* serial.c: Serial port driver infrastructure for the Sparc.
*
* Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
@@ -20,6 +20,11 @@
int serial_console;
+__initfunc(int con_is_present(void))
+{
+ return serial_console ? 0 : 1;
+}
+
__initfunc(static void
nop_rs_kgdb_hook(int channel))
{
@@ -64,24 +69,8 @@ rs_kgdb_hook(int channel))
rs_ops.rs_kgdb_hook(channel);
}
-__initfunc(static void sun_serial_finish_init(void))
-{
- extern unsigned char *linux_serial_image;
- extern int con_is_present(void);
- char buffer[2048];
-
- if (con_is_present())
- return;
-
- sprintf (buffer, linux_serial_image, UTS_RELEASE);
- printk(buffer);
-}
-
-__initfunc(long
-serial_console_init(long kmem_start, long kmem_end))
+__initfunc(void serial_console_init(void))
{
- sun_serial_finish_init();
- return kmem_start;
}
void rs_change_mouse_baud(int baud)