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/s390/char/tty3270.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/s390/char/tty3270.c')
-rw-r--r-- | drivers/s390/char/tty3270.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 9a141776873f..7d26a3e4cb80 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
@@ -1785,7 +1785,6 @@ tty3270_init(void) | |||
1785 | * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc | 1785 | * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc |
1786 | */ | 1786 | */ |
1787 | driver->owner = THIS_MODULE; | 1787 | driver->owner = THIS_MODULE; |
1788 | driver->devfs_name = "ttyTUB/"; | ||
1789 | driver->driver_name = "ttyTUB"; | 1788 | driver->driver_name = "ttyTUB"; |
1790 | driver->name = "ttyTUB"; | 1789 | driver->name = "ttyTUB"; |
1791 | driver->major = IBM_TTY3270_MAJOR; | 1790 | driver->major = IBM_TTY3270_MAJOR; |
@@ -1793,7 +1792,7 @@ tty3270_init(void) | |||
1793 | driver->type = TTY_DRIVER_TYPE_SYSTEM; | 1792 | driver->type = TTY_DRIVER_TYPE_SYSTEM; |
1794 | driver->subtype = SYSTEM_TYPE_TTY; | 1793 | driver->subtype = SYSTEM_TYPE_TTY; |
1795 | driver->init_termios = tty_std_termios; | 1794 | driver->init_termios = tty_std_termios; |
1796 | driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_NO_DEVFS; | 1795 | driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_DYNAMIC_DEV; |
1797 | tty_set_operations(driver, &tty3270_ops); | 1796 | tty_set_operations(driver, &tty3270_ops); |
1798 | ret = tty_register_driver(driver); | 1797 | ret = tty_register_driver(driver); |
1799 | if (ret) { | 1798 | if (ret) { |