From f4695c7f8518a46bf8ac88f35a3c8c3dafb3c63d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Oct 2007 03:04:34 -0700 Subject: [PATCH] --- yaml --- r: 71095 b: refs/heads/master c: 77bf2bab91e4e7df361963451c7b9a803516438c h: refs/heads/master i: 71093: 0c8eb3baed90f96bb4c8c495041f8a1e22fe40d0 71091: e36b559c46b2580d1f8405e4639f17d8fa716508 71087: ecf9de40a630a36b886c9dd27d1f7d7dfaa8ed09 v: v3 --- [refs] | 2 +- trunk/drivers/char/Kconfig | 17 ----------------- trunk/drivers/char/vt.c | 6 +----- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index e9371463846f..24b41560758d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7c698f755c843dec5c54bf89893c320b8fbdfce +refs/heads/master: 77bf2bab91e4e7df361963451c7b9a803516438c diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig index 204d53e506de..4dbee616eac6 100644 --- a/trunk/drivers/char/Kconfig +++ b/trunk/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/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 645ad9808982..1764c67b585f 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/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); /*