diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
commit | 602cada851b28c5792339786efe872fbdc1f5d41 (patch) | |
tree | 233d474b74d6038b5bb54a07ad91dd1bb10b0218 /drivers/isdn/i4l/isdn_tty.c | |
parent | 82991c6f2c361acc17279b8124d9bf1878973435 (diff) | |
parent | fee68d1cc0d9bd863e51c16cdcd707737b16bb38 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
[PATCH] devfs: Remove it from the feature_removal.txt file
[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
[PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
[PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
[PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
[PATCH] devfs: Remove devfs support from the sound subsystem
[PATCH] devfs: Remove devfs support from the ide subsystem.
[PATCH] devfs: Remove devfs support from the serial subsystem
[PATCH] devfs: Remove devfs from the init code
[PATCH] devfs: Remove devfs from the partition code
...
Diffstat (limited to 'drivers/isdn/i4l/isdn_tty.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index 433389daedb2..0a53a990c100 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
@@ -1890,14 +1890,13 @@ isdn_tty_modem_init(void) | |||
1890 | if (!m->tty_modem) | 1890 | if (!m->tty_modem) |
1891 | return -ENOMEM; | 1891 | return -ENOMEM; |
1892 | m->tty_modem->name = "ttyI"; | 1892 | m->tty_modem->name = "ttyI"; |
1893 | m->tty_modem->devfs_name = "isdn/ttyI"; | ||
1894 | m->tty_modem->major = ISDN_TTY_MAJOR; | 1893 | m->tty_modem->major = ISDN_TTY_MAJOR; |
1895 | m->tty_modem->minor_start = 0; | 1894 | m->tty_modem->minor_start = 0; |
1896 | m->tty_modem->type = TTY_DRIVER_TYPE_SERIAL; | 1895 | m->tty_modem->type = TTY_DRIVER_TYPE_SERIAL; |
1897 | m->tty_modem->subtype = SERIAL_TYPE_NORMAL; | 1896 | m->tty_modem->subtype = SERIAL_TYPE_NORMAL; |
1898 | m->tty_modem->init_termios = tty_std_termios; | 1897 | m->tty_modem->init_termios = tty_std_termios; |
1899 | m->tty_modem->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; | 1898 | m->tty_modem->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; |
1900 | m->tty_modem->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; | 1899 | m->tty_modem->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; |
1901 | m->tty_modem->driver_name = "isdn_tty"; | 1900 | m->tty_modem->driver_name = "isdn_tty"; |
1902 | tty_set_operations(m->tty_modem, &modem_ops); | 1901 | tty_set_operations(m->tty_modem, &modem_ops); |
1903 | retval = tty_register_driver(m->tty_modem); | 1902 | retval = tty_register_driver(m->tty_modem); |