s390/tty3270: rename to con3270

Rename the driver file to con3270 to be in sync with con3215.c.
This removes CONFIG_TN3270_TTY, it is now always build if CONFIG_TN3270
is enabled.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Tested-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 7d1749b..80c4e51 100644 (file)
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -5,17 +5,10 @@ comment "S/390 character device drivers"
 config TN3270
        def_tristate y
        prompt "Support for locally attached 3270 terminals"
-       depends on CCW
+       depends on CCW && TTY
        help
          Include support for IBM 3270 terminals.
 
-config TN3270_TTY
-       def_tristate y
-       prompt "Support for tty input/output on 3270 terminals"
-       depends on TN3270 && TTY
-       help
-         Include support for using an IBM 3270 terminal as a Linux tty.
-
 config TN3270_FS
        def_tristate m
        prompt "Support for fullscreen applications on 3270 terminals"
@@ -26,7 +19,7 @@ config TN3270_FS
 config TN3270_CONSOLE
        def_bool y
        prompt "Support for console on 3270 terminal"
-       depends on TN3270=y && TN3270_TTY=y
+       depends on TN3270=y
        help
          Include support for using an IBM 3270 terminal as a Linux system
          console.  Available only if 3270 support is compiled in statically.

diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index e3bcbbb..b0f6b32 100644 (file)
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -21,8 +21,7 @@ obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \
         sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o \
         sclp_early.o sclp_early_core.o sclp_sd.o
 
-obj-$(CONFIG_TN3270) += raw3270.o
-obj-$(CONFIG_TN3270_TTY) += tty3270.o
+obj-$(CONFIG_TN3270) += raw3270.o con3270.o
 obj-$(CONFIG_TN3270_FS) += fs3270.o
 
 obj-$(CONFIG_TN3215) += con3215.o

diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/con3270.c
similarity index 100%
rename from drivers/s390/char/tty3270.c
rename to drivers/s390/char/con3270.c