diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
| commit | ac5ff8f4a72f7b4e66f73c3c6cb9fe7758cf6f12 (patch) | |
| tree | 9fc7f8ce32e0d9a4aa055b2a58a05a5d727b333c /drivers/sbus/char | |
| parent | 52662ff3e66770fd7e4fc508c91056d29c08bff0 (diff) | |
Sync with Linux 2.1.42.
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/sunserial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/sunserial.c b/drivers/sbus/char/sunserial.c index 2fa29da26..e89384a3a 100644 --- a/drivers/sbus/char/sunserial.c +++ b/drivers/sbus/char/sunserial.c @@ -1,4 +1,4 @@ -/* $Id: sunserial.c,v 1.41 1997/05/14 20:46:51 davem Exp $ +/* $Id: sunserial.c,v 1.42 1997/05/26 20:10:20 davem Exp $ * serial.c: Serial port driver for the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -1062,7 +1062,7 @@ static void rs_fair_output(void) /* * zs_console_print is registered for printk. */ -static void zs_console_print(const char *s, int count) +static void zs_console_print(const char *s, unsigned count) { int i; @@ -1867,7 +1867,7 @@ int rs_open(struct tty_struct *tty, struct file * filp) static void show_serial_version(void) { - char *revision = "$Revision: 1.41 $"; + char *revision = "$Revision: 1.42 $"; char *version, *p; version = strchr(revision, ' '); @@ -2198,7 +2198,7 @@ rs_cons_check(struct sun_serial *ss, int channel) o = 1; /* double whee.. */ if(!consout_registered) { - extern void serial_finish_init (void (*)(const char *, int count)); + extern void serial_finish_init (void (*)(const char *, unsigned count)); serial_finish_init (zs_console_print); register_console(&console); |