diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /drivers/sbus | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/audio/cs4231.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/audio/dbri.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/zs.c | 14 |
3 files changed, 4 insertions, 14 deletions
diff --git a/drivers/sbus/audio/cs4231.c b/drivers/sbus/audio/cs4231.c index 442c25206..82e0fc494 100644 --- a/drivers/sbus/audio/cs4231.c +++ b/drivers/sbus/audio/cs4231.c @@ -1,4 +1,4 @@ -/* $Id: cs4231.c,v 1.41 1999/12/19 23:28:03 davem Exp $ +/* $Id: cs4231.c,v 1.42 2000/01/28 13:42:48 jj Exp $ * drivers/sbus/audio/cs4231.c * * Copyright 1996, 1997, 1998, 1999 Derrick J Brashear (shadow@andrew.cmu.edu) diff --git a/drivers/sbus/audio/dbri.c b/drivers/sbus/audio/dbri.c index 0b73b8e0d..a3f083ead 100644 --- a/drivers/sbus/audio/dbri.c +++ b/drivers/sbus/audio/dbri.c @@ -1,4 +1,4 @@ -/* $Id: dbri.c,v 1.17 2000/01/20 07:57:47 anton Exp $ +/* $Id: dbri.c,v 1.18 2000/01/28 13:42:50 jj Exp $ * drivers/sbus/audio/dbri.c * * Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c index d0ec266c0..77f031cce 100644 --- a/drivers/sbus/char/zs.c +++ b/drivers/sbus/char/zs.c @@ -1,4 +1,4 @@ -/* $Id: zs.c,v 1.52 1999/12/15 14:29:20 davem Exp $ +/* $Id: zs.c,v 1.53 2000/01/29 01:29:38 anton Exp $ * zs.c: Zilog serial port driver for the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -1928,7 +1928,7 @@ int zs_open(struct tty_struct *tty, struct file * filp) static void show_serial_version(void) { - char *revision = "$Revision: 1.52 $"; + char *revision = "$Revision: 1.53 $"; char *version, *p; version = strchr(revision, ' '); @@ -2076,11 +2076,6 @@ static struct sun_zslayout * __init get_zs(int chip) static int irq = 0; int chipid = chip; -#if CONFIG_AP1000 - printk("No zs chip\n"); - return NULL; -#endif - iospace = 0; if(chip < 0 || chip >= NUM_SERIAL) panic("get_zs bogon zs chip number"); @@ -2407,11 +2402,6 @@ int __init zs_init(void) struct sun_serial *info; char dummy; -#if CONFIG_AP1000 - printk("not doing zs_init()\n"); - return 0; -#endif - /* Setup base handler, and timer table. */ init_bh(SERIAL_BH, do_serial_bh); timer_table[RS_TIMER].fn = zs_timer; |