summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/char/Kconfig5
-rw-r--r--drivers/tty/Kconfig6
-rw-r--r--drivers/tty/hvc/Kconfig3
-rw-r--r--drivers/tty/serial/Kconfig4
4 files changed, 6 insertions, 12 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b77f796a5ace..5d30b19099aa 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -7,9 +7,6 @@ menu "Character devices"
source "drivers/tty/Kconfig"
-source "drivers/tty/serial/Kconfig"
-source "drivers/tty/serdev/Kconfig"
-
config TTY_PRINTK
tristate "TTY driver to output user messages via printk"
depends on EXPERT && TTY
@@ -94,8 +91,6 @@ config PPDEV
If unsure, say N.
-source "drivers/tty/hvc/Kconfig"
-
config VIRTIO_CONSOLE
tristate "Virtio console"
depends on VIRTIO && TTY
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index a312cb33a99b..ebd2549bba6d 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -477,4 +477,10 @@ config LDISC_AUTOLOAD
dev.tty.ldisc_autoload sysctl, this configuration option will
only set the default value of this functionality.
+source "drivers/tty/hvc/Kconfig"
+
+source "drivers/tty/serial/Kconfig"
+
endif # TTY
+
+source "drivers/tty/serdev/Kconfig"
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 6a3c97d345a0..31b7e1b03749 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-if TTY
config HVC_DRIVER
bool
@@ -113,5 +112,3 @@ config HVCS
will depend on arch specific APIs exported from hvcserver.ko
which will also be compiled when this driver is built as a
module.
-
-endif # TTY
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 52eaac21ff9f..a19c9d7fff2e 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -3,8 +3,6 @@
# Serial device configuration
#
-if TTY
-
menu "Serial drivers"
depends on HAS_IOMEM
@@ -1576,5 +1574,3 @@ endmenu
config SERIAL_MCTRL_GPIO
tristate
-
-endif # TTY