Skip to content

Commit

Permalink
tty: source all tty Kconfig files in one place
Browse files Browse the repository at this point in the history
'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: Jiri Slaby <jslaby@suse.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20200311225736.32147-3-rdunlap@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Mar 12, 2020
1 parent 8d7dc56 commit 00e3754
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
5 changes: 0 additions & 5 deletions drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions drivers/tty/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 0 additions & 3 deletions drivers/tty/hvc/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
if TTY

config HVC_DRIVER
bool
Expand Down Expand Up @@ -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
4 changes: 0 additions & 4 deletions drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# Serial device configuration
#

if TTY

menu "Serial drivers"
depends on HAS_IOMEM

Expand Down Expand Up @@ -1576,5 +1574,3 @@ endmenu

config SERIAL_MCTRL_GPIO
tristate

endif # TTY

0 comments on commit 00e3754

Please sign in to comment.