diff options
| author | Dave Jones <davej@halogen.(none)> | 2002-12-30 23:08:22 +0000 |
|---|---|---|
| committer | Dave Jones <davej@halogen.(none)> | 2002-12-30 23:08:22 +0000 |
| commit | 1f46ead556d590cbb585ecaebe8ac1871d3c6dab (patch) | |
| tree | 680083ed2d1564b17306d6cfee9d2b1a3c973f29 /include/linux/tty.h | |
| parent | 05ae9880250d5ffe81f9385a83b8d4e73ca5c4c0 (diff) | |
| parent | 43fb68dc00a8ab0b728e27c2a8fd4033d2ba0932 (diff) | |
Merge halogen.(none):/home/davej/src/kernel/2.5/bk-linus
into halogen.(none):/home/davej/src/kernel/2.5/agpgart
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 11b82d2c98ae..ad3149de8631 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -379,9 +379,8 @@ extern void start_tty(struct tty_struct * tty); extern int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc); extern int tty_register_driver(struct tty_driver *driver); extern int tty_unregister_driver(struct tty_driver *driver); -extern void tty_register_devfs (struct tty_driver *driver, unsigned int flags, - unsigned minor); -extern void tty_unregister_devfs (struct tty_driver *driver, unsigned minor); +extern void tty_register_device(struct tty_driver *driver, unsigned minor); +extern void tty_unregister_device(struct tty_driver *driver, unsigned minor); extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp, int buflen); extern void tty_write_message(struct tty_struct *tty, char *msg); |