Skip to content

Commit

Permalink
Remove CONFIG_VT_UNICODE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Engelhardt authored and Linus Torvalds committed Oct 18, 2007
1 parent b7c698f commit 77bf2ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
17 changes: 0 additions & 17 deletions drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions drivers/char/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down

0 comments on commit 77bf2ba

Please sign in to comment.