3 files changed, 11 insertions, 3 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 6c070dc5f2d4..d0ac944e1696 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -36,6 +36,14 @@ config VT
           If unsure, say Y, or else you won't be able to do much with your new
           shiny Linux system :-)
 
+config CONSOLE_TRANSLATIONS
+        depends on VT
+        default y
+        bool "Enable character translations in console" if EMBEDDED
+        ---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
         depends on VT
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index f7a0d1a754fc..8a161c30e1dc 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -12,8 +12,8 @@ obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o
 obj-$(CONFIG_LEGACY_PTYS)       += pty.o
 obj-$(CONFIG_UNIX98_PTYS)       += pty.o
 obj-y                           += misc.o
-obj-$(CONFIG_VT)                += vt_ioctl.o vc_screen.o consolemap.o \
-                                   consolemap_deftbl.o selection.o keyboard.o
+obj-$(CONFIG_VT)                += vt_ioctl.o vc_screen.o selection.o keyboard.o
+obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
 obj-$(CONFIG_HW_CONSOLE)        += vt.o defkeymap.o
 obj-$(CONFIG_AUDIT)             += tty_audit.o
 obj-$(CONFIG_MAGIC_SYSRQ)       += sysrq.o
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index cb8c90da3934..82a51f38a546 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2211,7 +2211,7 @@ rescan_last_byte:
                         c = 0xfffd;
                     tc = c;
                 } else {        /* no utf or alternate charset mode */
-                    tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c];
+                    tc = vc_translate(vc, c);
                 }
 
                 param.c = tc;