Merge branch 'devicetree/merge' into spi/merge

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 0f175a866ef0..b7980a83ce2d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -5,7 +5,7 @@
 menu "Character devices"
 
 config VT
-        bool "Virtual terminal" if EMBEDDED
+        bool "Virtual terminal" if EXPERT
         depends on !S390
         select INPUT
         default y
@@ -39,13 +39,13 @@ config VT
 config CONSOLE_TRANSLATIONS
         depends on VT
         default y
-        bool "Enable character translations in console" if EMBEDDED
+        bool "Enable character translations in console" if EXPERT
         ---help---
           This enables support for font mapping and Unicode translation
           on virtual consoles.
 
 config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EMBEDDED
+        bool "Support for console on virtual terminal" if EXPERT
         depends on VT
         default y
         ---help---
@@ -426,10 +426,10 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
-source "drivers/serial/Kconfig"
+source "drivers/tty/serial/Kconfig"
 
 config UNIX98_PTYS
-        bool "Unix98 PTY support" if EMBEDDED
+        bool "Unix98 PTY support" if EXPERT
         default y
         ---help---
           A pseudo terminal (PTY) is a software device consisting of two
@@ -495,7 +495,7 @@ config LEGACY_PTY_COUNT
 
 config TTY_PRINTK
         bool "TTY driver to output user messages via printk"
-        depends on EMBEDDED
+        depends on EXPERT
         default n
         ---help---
           If you say Y here, the support for writing user messages (i.e.