Commit 00e37543 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman

tty: source all tty Kconfig files in one place

'source' (include) all of the tty/*/Kconfig files from
drivers/tty/Kconfig instead of from drivers/char/Kconfig.
This consolidates them both in source code and in menu
presentation to the user.

Move hvc/Kconfig and serial/Kconfig 'source' lines into the
if TTY/endif block and remove the if TTY/endif blocks from
those 2 files.

Cc: linux-serial@vger.kernel.org
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarJiri Slaby <jslaby@suse.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20200311225736.32147-3-rdunlap@infradead.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d7dc56e
...@@ -7,9 +7,6 @@ menu "Character devices" ...@@ -7,9 +7,6 @@ menu "Character devices"
source "drivers/tty/Kconfig" source "drivers/tty/Kconfig"
source "drivers/tty/serial/Kconfig"
source "drivers/tty/serdev/Kconfig"
config TTY_PRINTK config TTY_PRINTK
tristate "TTY driver to output user messages via printk" tristate "TTY driver to output user messages via printk"
depends on EXPERT && TTY depends on EXPERT && TTY
...@@ -94,8 +91,6 @@ config PPDEV ...@@ -94,8 +91,6 @@ config PPDEV
If unsure, say N. If unsure, say N.
source "drivers/tty/hvc/Kconfig"
config VIRTIO_CONSOLE config VIRTIO_CONSOLE
tristate "Virtio console" tristate "Virtio console"
depends on VIRTIO && TTY depends on VIRTIO && TTY
......
...@@ -477,4 +477,10 @@ config LDISC_AUTOLOAD ...@@ -477,4 +477,10 @@ config LDISC_AUTOLOAD
dev.tty.ldisc_autoload sysctl, this configuration option will dev.tty.ldisc_autoload sysctl, this configuration option will
only set the default value of this functionality. only set the default value of this functionality.
source "drivers/tty/hvc/Kconfig"
source "drivers/tty/serial/Kconfig"
endif # TTY endif # TTY
source "drivers/tty/serdev/Kconfig"
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
if TTY
config HVC_DRIVER config HVC_DRIVER
bool bool
...@@ -113,5 +112,3 @@ config HVCS ...@@ -113,5 +112,3 @@ config HVCS
will depend on arch specific APIs exported from hvcserver.ko will depend on arch specific APIs exported from hvcserver.ko
which will also be compiled when this driver is built as a which will also be compiled when this driver is built as a
module. module.
endif # TTY
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Serial device configuration # Serial device configuration
# #
if TTY
menu "Serial drivers" menu "Serial drivers"
depends on HAS_IOMEM depends on HAS_IOMEM
...@@ -1576,5 +1574,3 @@ endmenu ...@@ -1576,5 +1574,3 @@ endmenu
config SERIAL_MCTRL_GPIO config SERIAL_MCTRL_GPIO
tristate tristate
endif # TTY
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment