Remove CONFIG_VT_UNICODE

Since default_utf8 is already a sysfs attribute, having an extra
CONFIG_VT_UNICODE compile-time option is redundant, since sysfs attributes can
be set at boot and run time.

Also let Linux VCs default to UTF-8 (as per the discussion at
http://lkml.org/lkml/2007/9/6/99).

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Cc: Bill Nottingham <notting@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 204d53e506de40af3d37d42e2a1030dbdda323d0..4dbee616eac6c196cffee839effdcd5682e99486 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -36,23 +36,6 @@ config VT
          If unsure, say Y, or else you won't be able to do much with your new
          shiny Linux system :-)
 
-config VT_UNICODE
-       bool "Virtual console is Unicode by default"
-       depends on VT
-       default n
-       ---help---
-         If you say Y here, the virtual terminal will be in UTF-8 by default,
-         and the keyboard will run in unicode mode.
-
-         If you say N here, the virtual terminal will not be in UTF-8 by
-         default, and the keyboard will run in XLATE mode.
-
-         This can also be changed by passing 'default_utf8=<0|1>' on the
-         kernel command line.
-
-         Historically, the kernel has defaulted to non-UTF8 and XLATE mode.
-         If unsure, say N here.
-
 config VT_CONSOLE
        bool "Support for console on virtual terminal" if EMBEDDED
        depends on VT

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 645ad9808982526cf8f7ae4fdf682e2a433ed72e..1764c67b585f6cc5fd045877b517bef5e3492f72 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -158,11 +158,7 @@ static void blank_screen_t(unsigned long dummy);
 static void set_palette(struct vc_data *vc);
 
 static int printable;          /* Is console ready for printing? */
-#ifdef CONFIG_VT_UNICODE
-int default_utf8 = 1;
-#else
-int default_utf8;
-#endif
+int default_utf8 = true;
 module_param(default_utf8, int, S_IRUGO | S_IWUSR);
 
 /*