diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/linux/tty.h | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 6cb629d08..69050c8a8 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -344,12 +344,13 @@ extern int fg_console, last_console, want_console; extern int kmsg_redirect; -extern unsigned long con_init(unsigned long); +extern void con_init(void); +extern void console_init(void); extern int rs_init(void); extern int lp_init(void); extern int pty_init(void); -extern int tty_init(void); +extern void tty_init(void); extern int ip2_init(void); extern int pcxe_init(void); extern int pc_init(void); @@ -398,7 +399,7 @@ extern int n_tty_ioctl(struct tty_struct * tty, struct file * file, /* serial.c */ -extern long serial_console_init(long kmem_start, long kmem_end); +extern void serial_console_init(void); /* pcxx.c */ |