diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-25 17:29:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-25 17:29:20 +0000 |
| commit | a2802ba71448d113592657a8df67de39c462f215 (patch) | |
| tree | a1a78d5927d985ada2c6e1063ebf38e0ca744e24 /drivers | |
| parent | 47d3618123eab821c1608ed87589746340868c12 (diff) | |
Dejunk.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/dz.c | 8 | ||||
| -rw-r--r-- | drivers/char/misc.c | 2 | ||||
| -rw-r--r-- | drivers/char/serial.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/dz.c b/drivers/char/dz.c index 35f6b0379..ceea1ff25 100644 --- a/drivers/char/dz.c +++ b/drivers/char/dz.c @@ -1200,7 +1200,7 @@ static int block_til_ready (struct tty_struct *tty, struct file *filp, struct dz info->count--; info->blocked_open++; while (1) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); if (tty_hung_up_p (filp) || !(info->is_initialized)) { retval = -EAGAIN; break; @@ -1287,7 +1287,7 @@ static void show_serial_version (void) } -__initfunc(int dz_init(void)) +int __init dz_init(void) { int i, flags; struct dz_serial *info; @@ -1461,7 +1461,7 @@ static kdev_t dz_console_device(struct console *c) return MKDEV(TTY_MAJOR, 64 + c->index); } -__initfunc(static int dz_console_setup(struct console *co, char *options)) +static int __init dz_console_setup(struct console *co, char *options) { int baud = 9600; int bits = 8; @@ -1565,7 +1565,7 @@ static struct console dz_sercons = { NULL }; -__initfunc (long dz_serial_console_init(long kmem_start, long kmem_end)) +long __init dz_serial_console_init(long kmem_start, long kmem_end) { register_console(&dz_sercons); diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 99884a00a..d3687d9f6 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -72,6 +72,8 @@ extern void streamable_init(void); extern void watchdog_init(void); extern void pcwatchdog_init(void); extern int rtc_sun_init(void); /* Combines MK48T02 and MK48T08 */ +extern int rtc_DP8570A_init(void); +extern int rtc_MK48T08_init(void); extern int ds1286_init(void); extern int dsp56k_init(void); extern int radio_init(void); diff --git a/drivers/char/serial.c b/drivers/char/serial.c index 3b9a71f9e..9c3f2e2e5 100644 --- a/drivers/char/serial.c +++ b/drivers/char/serial.c @@ -13,8 +13,6 @@ * set_serial_info fixed to set the flags, custom divisor, and uart * type fields. Fix suggested by Michael K. Johnson 12/12/92. * - * Mips JAZZ support by Andreas Busse (andy@ivm.net) - * * 11/95: TIOCMIWAIT, TIOCGICOUNT by Angelo Haritsis <ah@doc.ic.ac.uk> * * 03/96: Modularised by Angelo Haritsis <ah@doc.ic.ac.uk> |